diff options
| author |   djm <djm@openbsd.org> | 2011-12-04 23:16:12 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2011-12-04 23:16:12 +0000 |
| commit | b2e7d16323cf83b0b6ac1149ff273b37215523e8 (patch) | |
| tree | b553cc874caed0ce0dbc77e7e2effc4f1a11b892 | |
| parent | Slightly different fix for the problem fixed by the previous commit for better (diff) | |
| download | wireguard-openbsd-b2e7d16323cf83b0b6ac1149ff273b37215523e8.tar.xz wireguard-openbsd-b2e7d16323cf83b0b6ac1149ff273b37215523e8.zip | |
revert:
> revision 1.32
> date: 2011/12/02 00:41:56; author: djm; state: Exp; lines: +4 -1
> fix bz#1948: ssh -f doesn't fork for multiplexed connection.
> ok dtucker@
it interacts badly with ControlPersist
| -rw-r--r-- | usr.bin/ssh/mux.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index 09d4005fd20..d8a7b07e78f 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.32 2011/12/02 00:41:56 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.33 2011/12/04 23:16:12 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -78,7 +78,6 @@ 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 { @@ -1779,8 +1778,6 @@ 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. |