- markus@cvs.openbsd.org 2010/09/02 16:08:39

     [ssh.c]
     unbreak ControlPersist=yes for ControlMaster=yes; ok djm@

1 files changed, 2 insertions, 1 deletions

diff --git a/ssh.c b/ssh.c
index e5b643258..51c68d7da 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.350 2010/08/31 12:33:38 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.351 2010/09/02 16:08:39 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -936,6 +936,7 @@ control_persist_detach(void)
                 tty_flag = otty_flag;
                 close(muxserver_sock);
                 muxserver_sock = -1;
+                options.control_master = SSHCTL_MASTER_NO;
                 muxclient(options.control_path);
                 /* muxclient() doesn't return on success. */
                 fatal("Failed to connect to new control master");