diff options
author | Damien Miller <djm@mindrot.org> | 2010-09-10 11:17:02 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-09-10 11:17:02 +1000 |
commit | 5929c52f65fc2029fb9b496ccfa91bd4cecca0be (patch) | |
tree | e9da94e7fa077f321ccb9e9c74493ceaa6d99950 | |
parent | 5773794d55a4e30eac2b45adb4dfcb48727c07ae (diff) | |
download | openssh-git-5929c52f65fc2029fb9b496ccfa91bd4cecca0be.tar.gz |
- markus@cvs.openbsd.org 2010/09/02 16:08:39
[ssh.c]
unbreak ControlPersist=yes for ControlMaster=yes; ok djm@
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -21,6 +21,9 @@ - markus@cvs.openbsd.org 2010/09/02 16:07:25 [ssh-keygen.c] permit -b 256, 384 or 521 as key size for ECDSA; ok djm@ + - markus@cvs.openbsd.org 2010/09/02 16:08:39 + [ssh.c] + unbreak ControlPersist=yes for ControlMaster=yes; ok djm@ 20100831 - OpenBSD CVS Sync @@ -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"); |