tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 23:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/12/04 23:16:12

Browse Source 
[mux.c]
     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
This commit is contained in:
Damien Miller 2012-06-20 21:46:57 +10:00
parent efc6fc995d
commit 140df63e1f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -4,7 +4,14 @@
[mux.c] [mux.c]
fix bz#1948: ssh -f doesn't fork for multiplexed connection. fix bz#1948: ssh -f doesn't fork for multiplexed connection.
ok dtucker@ ok dtucker@
- djm@cvs.openbsd.org 2011/12/04 23:16:12
[mux.c]
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
20120519 20120519
- (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch

5
mux.c
View File

@ -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> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -95,7 +95,6 @@ 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 {
@ -1801,8 +1800,6 @@ 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.