tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2005/06/18 04:30:36 

[ssh.c ssh_config.5]
     allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@
This commit is contained in:
Damien Miller 2005-06-26 08:56:03 +10:00
parent 9651fe690a
commit 8f74c8fc32
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,9 @@
[ssh.c sshconnect.c] [ssh.c sshconnect.c]
Fix ControlPath's %p expanding to "0" for a default port, Fix ControlPath's %p expanding to "0" for a default port,
spotted dwmw2 AT infradead.org; ok markus@ spotted dwmw2 AT infradead.org; ok markus@
- djm@cvs.openbsd.org 2005/06/18 04:30:36
[ssh.c ssh_config.5]
allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@
20050618 20050618
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -2756,4 +2759,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3828 2005/06/25 22:55:25 djm Exp $ $Id: ChangeLog,v 1.3829 2005/06/25 22:56:03 djm Exp $

5
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.244 2005/06/17 22:53:46 djm Exp $"); RCSID("$OpenBSD: ssh.c,v 1.245 2005/06/18 04:30:36 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -610,6 +610,9 @@ again:
if (options.proxy_command != NULL && if (options.proxy_command != NULL &&
strcmp(options.proxy_command, "none") == 0) strcmp(options.proxy_command, "none") == 0)
options.proxy_command = NULL; options.proxy_command = NULL;
if (options.control_path != NULL &&
strcmp(options.control_path, "none") == 0)
options.control_path = NULL;
if (options.control_path != NULL) { if (options.control_path != NULL) {
snprintf(buf, sizeof(buf), "%d", options.port); snprintf(buf, sizeof(buf), "%d", options.port);

6
ssh_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.56 2005/06/08 11:25:09 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.57 2005/06/18 04:30:36 djm Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -293,7 +293,9 @@ option.
Specify the path to the control socket used for connection sharing as described Specify the path to the control socket used for connection sharing as described
in the in the
.Cm ControlMaster .Cm ControlMaster
section above. section above or the string
.Dq none
to disable connection sharing.
In the path, In the path,
.Ql %h .Ql %h
will be substituted by the target host name, will be substituted by the target host name,