diff options
| author | djm <djm> | 2011-12-18 23:51:11 +0000 |
|---|---|---|
| committer | djm <djm> | 2011-12-18 23:51:11 +0000 |
| commit | 57d03efa76f1238ccf4838239f1a5c9366fc9d74 (patch) | |
| tree | c6e683796734377be4d1d5be41e5701e8cd3931b | |
| parent | 28bd32c422e2b477f54808d82de5dbbb23eaa892 (diff) | |
| download | openssh-57d03efa76f1238ccf4838239f1a5c9366fc9d74.tar.gz | |
- djm@cvs.openbsd.org 2011/12/02 00:41:56
[mux.c]
fix bz#1948: ssh -f doesn't fork for multiplexed connection.
ok dtucker@
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | mux.c | 5 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,10 @@ +20111219 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/12/02 00:41:56 + [mux.c] + fix bz#1948: ssh -f doesn't fork for multiplexed connection. + ok dtucker@ + 20111125 - OpenBSD CVS Sync - oga@cvs.openbsd.org 2011/11/16 12:24:28 @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.31 2011/09/23 07:45:05 markus Exp $ */ +/* $OpenBSD: mux.c,v 1.32 2011/12/02 00:41:56 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -95,6 +95,7 @@ extern Buffer command; extern volatile sig_atomic_t quit_pending; extern char *stdio_forward_host; extern int stdio_forward_port; +extern int fork_after_authentication_flag; /* Context for session open confirmation callback */ struct mux_session_confirm_ctx { @@ -1802,6 +1803,8 @@ mux_client_request_session(int fd) if (tty_flag) enter_raw_mode(options.request_tty == REQUEST_TTY_FORCE); + if (fork_after_authentication_flag) + daemon(1, 1); /* * Stick around until the controlee closes the client_fd. * Before it does, it is expected to write an exit message. |