diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2010-09-02 16:08:40 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2010-09-02 16:08:40 +0000 |
| commit | 5ce874838aabadc6e9b617de1d179b18a92b57d5 (patch) | |
| tree | 4dccb394ef9f8195295e85470b8ed2550032304f /usr.bin/ssh | |
| parent | c85d1546776ae961d34e385c7f4a10bf0edcc978 (diff) | |
unbreak ControlPersist=yes for ControlMaster=yes; ok djm@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 3 |
1 files changed, 2 insertions, 1 deletions
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"); |