diff options
| author | Damien Miller <djm@mindrot.org> | 2010-07-16 05:56:23 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-07-16 05:56:23 +0200 |
| commit | 1f25ab43f4b374f920120b93ae3ed2f8521472c5 (patch) | |
| tree | c372ceb46961e97697b0c0f84e95178b945e918b /ssh.c | |
| parent | - djm@cvs.openbsd.org 2010/07/02 04:32:44 (diff) | |
| download | openssh-1f25ab43f4b374f920120b93ae3ed2f8521472c5.tar.xz openssh-1f25ab43f4b374f920120b93ae3ed2f8521472c5.zip | |
- 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@
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1301,8 +1301,13 @@ ssh_session2(void) /* Start listening for multiplex clients */ 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; if (daemon(1, 1) < 0) fatal("daemon() failed: %.200s", strerror(errno)); |