tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2010/09/02 16:08:39 

[ssh.c]
     unbreak ControlPersist=yes for ControlMaster=yes; ok djm@
This commit is contained in:
Damien Miller 2010-09-10 11:17:02 +10:00
parent 5773794d55
commit 5929c52f65
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21,6 +21,9 @@
- markus@cvs.openbsd.org 2010/09/02 16:07:25 - markus@cvs.openbsd.org 2010/09/02 16:07:25
[ssh-keygen.c] [ssh-keygen.c]
permit -b 256, 384 or 521 as key size for ECDSA; ok djm@ 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 20100831
- OpenBSD CVS Sync - OpenBSD CVS Sync

3
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -936,6 +936,7 @@ control_persist_detach(void)
tty_flag = otty_flag; tty_flag = otty_flag;
close(muxserver_sock); close(muxserver_sock);
muxserver_sock = -1; muxserver_sock = -1;
options.control_master = SSHCTL_MASTER_NO;
muxclient(options.control_path); muxclient(options.control_path);
/* muxclient() doesn't return on success. */ /* muxclient() doesn't return on success. */
fatal("Failed to connect to new control master"); fatal("Failed to connect to new control master");