summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-12-19 10:52:21 +1100
committerDamien Miller <djm@mindrot.org>2011-12-19 10:52:21 +1100
commit913ddff40d090751d50be2339cd859505b24f65b (patch)
treea66c7c82352e6cbf59e8711064073a8ece7cb1e5
parentd0e582c6da52377417474e157632d63be55bdbd2 (diff)
- 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
-rw-r--r--ChangeLog8
-rw-r--r--mux.c5
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index de12bbef..3f0471d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,14 @@
fix bz#1934: newer OpenSSL versions will require HMAC_CTX_Init before
HMAC_init (this change in policy seems insane to me)
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
20111125
- OpenBSD CVS Sync
diff --git a/mux.c b/mux.c
index cbc04be7..0b7abda0 100644
--- a/mux.c
+++ b/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>
*
@@ -95,7 +95,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 {
@@ -1803,8 +1802,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.