RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/07/12 22:38:52 

[ssh.c]
     Make ExitOnForwardFailure work with fork-after-authentication ("ssh -f")
     for protocol 2. ok markus@
This commit is contained in:
Damien Miller 2010-07-16 13:56:23 +10:00
parent 9308fc7743
commit 1f25ab43f4
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6,6 +6,10 @@
AllowUsers "blah blah" blah AllowUsers "blah blah" blah
was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com
ok dtucker; ok dtucker;
- djm@cvs.openbsd.org 2010/07/12 22:38:52
[ssh.c]
Make ExitOnForwardFailure work with fork-after-authentication ("ssh -f")
for protocol 2. ok markus@
20100714 20100714
- (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass

11
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.341 2010/06/26 23:04:04 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.342 2010/07/12 22:38:52 djm 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
@ -1301,8 +1301,13 @@ ssh_session2(void)
/* Start listening for multiplex clients */ /* Start listening for multiplex clients */
muxserver_listen(); muxserver_listen();
/* If requested, let ssh continue in the background. */ /*
if (fork_after_authentication_flag) { * If requested and we are not interested in replies to remote
* forwarding requests, then let ssh continue in the background.
*/
if (fork_after_authentication_flag &&
(!options.exit_on_forward_failure ||
options.num_remote_forwards == 0)) {
fork_after_authentication_flag = 0; fork_after_authentication_flag = 0;
if (daemon(1, 1) < 0) if (daemon(1, 1) < 0)
fatal("daemon() failed: %.200s", strerror(errno)); fatal("daemon() failed: %.200s", strerror(errno));