commit 8f74c8fc3216af41e466dbe7abbe8660679588ad
author Damien Miller <djm@mindrot.org> Sun Jun 26 08:56:03 2005 +1000
committer Damien Miller <djm@mindrot.org> Sun Jun 26 08:56:03 2005 +1000
tree 7b8e746dc78cf1bf92c75a8fc57874bb922413ee
parent 9651fe690a95378cdb9b2a1cf3e8c5cb625052c7

   - 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@

ssh.c

diff --git a/ssh.c b/ssh.c
index 2e93b16..91f8559 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #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/err.h>
@@ -610,6 +610,9 @@
 	if (options.proxy_command != NULL &&
 	    strcmp(options.proxy_command, "none") == 0)
 		options.proxy_command = NULL;
+	if (options.control_path != NULL &&
+	    strcmp(options.control_path, "none") == 0)
+		options.control_path = NULL;
 
 	if (options.control_path != NULL) {
 		snprintf(buf, sizeof(buf), "%d", options.port);