summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--mux.c5
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 67daa5485..76c6e920f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,14 @@
4 [mux.c] 4 [mux.c]
5 fix bz#1948: ssh -f doesn't fork for multiplexed connection. 5 fix bz#1948: ssh -f doesn't fork for multiplexed connection.
6 ok dtucker@ 6 ok dtucker@
7 7 - djm@cvs.openbsd.org 2011/12/04 23:16:12
8 [mux.c]
9 revert:
10 > revision 1.32
11 > date: 2011/12/02 00:41:56; author: djm; state: Exp; lines: +4 -1
12 > fix bz#1948: ssh -f doesn't fork for multiplexed connection.
13 > ok dtucker@
14 it interacts badly with ControlPersist
8 15
920120519 1620120519
10 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch 17 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
diff --git a/mux.c b/mux.c
index 35108ef8b..30b4f6f93 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.32 2011/12/02 00:41:56 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.33 2011/12/04 23:16:12 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -95,7 +95,6 @@ extern Buffer command;
95extern volatile sig_atomic_t quit_pending; 95extern volatile sig_atomic_t quit_pending;
96extern char *stdio_forward_host; 96extern char *stdio_forward_host;
97extern int stdio_forward_port; 97extern int stdio_forward_port;
98extern int fork_after_authentication_flag;
99 98
100/* Context for session open confirmation callback */ 99/* Context for session open confirmation callback */
101struct mux_session_confirm_ctx { 100struct mux_session_confirm_ctx {
@@ -1801,8 +1800,6 @@ mux_client_request_session(int fd)
1801 if (tty_flag) 1800 if (tty_flag)
1802 enter_raw_mode(options.request_tty == REQUEST_TTY_FORCE); 1801 enter_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
1803 1802
1804 if (fork_after_authentication_flag)
1805 daemon(1, 1);
1806 /* 1803 /*
1807 * Stick around until the controlee closes the client_fd. 1804 * Stick around until the controlee closes the client_fd.
1808 * Before it does, it is expected to write an exit message. 1805 * Before it does, it is expected to write an exit message.