tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Damien Miller 2011-12-19 10:51:11 +11:00
parent 47d8115e53
commit 5360dff2a0
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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 20111125
- OpenBSD CVS Sync - OpenBSD CVS Sync
- oga@cvs.openbsd.org 2011/11/16 12:24:28 - oga@cvs.openbsd.org 2011/11/16 12:24:28

5
mux.c
View File

@ -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> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -95,6 +95,7 @@ extern Buffer command;
extern volatile sig_atomic_t quit_pending; extern volatile sig_atomic_t quit_pending;
extern char *stdio_forward_host; extern char *stdio_forward_host;
extern int stdio_forward_port; extern int stdio_forward_port;
extern int fork_after_authentication_flag;
/* Context for session open confirmation callback */ /* Context for session open confirmation callback */
struct mux_session_confirm_ctx { struct mux_session_confirm_ctx {
@ -1802,6 +1803,8 @@ mux_client_request_session(int fd)
if (tty_flag) if (tty_flag)
enter_raw_mode(options.request_tty == REQUEST_TTY_FORCE); 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. * Stick around until the controlee closes the client_fd.
* Before it does, it is expected to write an exit message. * Before it does, it is expected to write an exit message.