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

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c60eacc11..519168aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
      [ssh.c sshconnect.c]
      Fix ControlPath's %p expanding to "0" for a default port,
      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
  - (djm) OpenBSD CVS Sync
@@ -2756,4 +2759,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (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 $
diff --git a/ssh.c b/ssh.c
index 2e93b161a..91f8559de 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 @@ again:
         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);
diff --git a/ssh_config.5 b/ssh_config.5
index a04ffc288..3e7ca8f28 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" 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
 .Dt SSH_CONFIG 5
 .Os
@@ -293,7 +293,9 @@ option.
 Specify the path to the control socket used for connection sharing as described
 in the
 .Cm ControlMaster
-section above.
+section above or the string
+.Dq none
+to disable connection sharing.
 In the path,
 .Ql %h
 will be substituted by the target host name,