From dd278512ae75db62dfa89bcd98f5dbbaeeab82be Mon Sep 17 00:00:00 2001
From: markus <markus@openbsd.org>
Date: Thu, 2 Sep 2010 16:08:39 +0000
Subject: unbreak ControlPersist=yes for ControlMaster=yes; ok djm@

---
 usr.bin/ssh/ssh.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr.bin/ssh/ssh.c')

diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index dbdc3882acc..f141be63642 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/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
@@ -917,6 +917,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");
-- 
cgit v1.2.3-59-g8ed1b