diff options
author | Damien Miller <djm@mindrot.org> | 2010-07-16 13:56:23 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-07-16 13:56:23 +1000 |
commit | 1f25ab43f4b374f920120b93ae3ed2f8521472c5 (patch) | |
tree | c372ceb46961e97697b0c0f84e95178b945e918b | |
parent | 9308fc7743d485f7ddf6dfd7c2e222588f7623df (diff) |
- 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@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ssh.c | 11 |
2 files changed, 12 insertions, 3 deletions
@@ -6,6 +6,10 @@ | |||
6 | AllowUsers "blah blah" blah | 6 | AllowUsers "blah blah" blah |
7 | was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com | 7 | was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com |
8 | ok dtucker; | 8 | ok dtucker; |
9 | - djm@cvs.openbsd.org 2010/07/12 22:38:52 | ||
10 | [ssh.c] | ||
11 | Make ExitOnForwardFailure work with fork-after-authentication ("ssh -f") | ||
12 | for protocol 2. ok markus@ | ||
9 | 13 | ||
10 | 20100714 | 14 | 20100714 |
11 | - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass | 15 | - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.341 2010/06/26 23:04:04 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.342 2010/07/12 22:38:52 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1301,8 +1301,13 @@ ssh_session2(void) | |||
1301 | /* Start listening for multiplex clients */ | 1301 | /* Start listening for multiplex clients */ |
1302 | muxserver_listen(); | 1302 | muxserver_listen(); |
1303 | 1303 | ||
1304 | /* If requested, let ssh continue in the background. */ | 1304 | /* |
1305 | if (fork_after_authentication_flag) { | 1305 | * If requested and we are not interested in replies to remote |
1306 | * forwarding requests, then let ssh continue in the background. | ||
1307 | */ | ||
1308 | if (fork_after_authentication_flag && | ||
1309 | (!options.exit_on_forward_failure || | ||
1310 | options.num_remote_forwards == 0)) { | ||
1306 | fork_after_authentication_flag = 0; | 1311 | fork_after_authentication_flag = 0; |
1307 | if (daemon(1, 1) < 0) | 1312 | if (daemon(1, 1) < 0) |
1308 | fatal("daemon() failed: %.200s", strerror(errno)); | 1313 | fatal("daemon() failed: %.200s", strerror(errno)); |