2 files changed, 7 insertions, 5 deletions

diff --git a/log.c b/log.c
index ad12930e1..277afda88 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.46 2015/07/08 19:04:21 markus Exp $ */
+/* $OpenBSD: log.c,v 1.47 2016/04/29 08:07:53 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -342,7 +342,7 @@ log_change_level(LogLevel new_log_level)
 int
 log_is_on_stderr(void)
 {
-        return log_on_stderr;
+        return log_on_stderr && log_stderr_fd == STDERR_FILENO;
 }
 
 /* redirect what would usually get written to stderr to specified file */
diff --git a/ssh.c b/ssh.c
index a999d5079..a881ba14c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.437 2016/03/07 19:02:43 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.438 2016/04/29 08:07:53 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1395,7 +1395,7 @@ static void
 control_persist_detach(void)
 {
         pid_t pid;
-        int devnull;
+        int devnull, keep_stderr;
 
         debug("%s: backgrounding master process", __func__);
 
@@ -1426,8 +1426,10 @@ control_persist_detach(void)
                 error("%s: open(\"/dev/null\"): %s", __func__,
                     strerror(errno));
         } else {
+                keep_stderr = log_is_on_stderr() && debug_flag;
                 if (dup2(devnull, STDIN_FILENO) == -1 ||
-                    dup2(devnull, STDOUT_FILENO) == -1)
+                    dup2(devnull, STDOUT_FILENO) == -1 ||
+                    (!keep_stderr && dup2(devnull, STDERR_FILENO) == -1))
                         error("%s: dup2: %s", __func__, strerror(errno));
                 if (devnull > STDERR_FILENO)
                         close(devnull);