===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- src/usr.bin/ssh/ssh.c	2010/08/31 12:33:38	1.350
+++ src/usr.bin/ssh/ssh.c	2010/09/02 16:08:39	1.351
@@ -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 @@
 		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");