diff options
| author |   markus <markus@openbsd.org> | 2010-09-02 16:08:39 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2010-09-02 16:08:39 +0000 |
| commit | dd278512ae75db62dfa89bcd98f5dbbaeeab82be (patch) | |
| tree | 065a83a1a6fb5870decb49c4dcda88870c006a67 /usr.bin/ssh/ssh.c | |
| parent | permit -b 256, 384 or 521 as key size for ECDSA; ok djm@ (diff) | |
| download | wireguard-openbsd-dd278512ae75db62dfa89bcd98f5dbbaeeab82be.tar.xz wireguard-openbsd-dd278512ae75db62dfa89bcd98f5dbbaeeab82be.zip | |
unbreak ControlPersist=yes for ControlMaster=yes; ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -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"); |