diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-04-29 08:07:53 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-07-22 14:16:22 +0100 |
commit | 751d1f6494fb3ffd75188de7390c28725a5b91a6 (patch) | |
tree | a9c60b131cd3d31c3b27619da11f49246bc4baa9 /log.c | |
parent | abde8dda29c2db2405d6fbca2fe022430e2c1177 (diff) |
upstream commit
close ControlPersist background process stderr when not
in debug mode or when logging to a file or syslog. bz#1988 ok dtucker
Upstream-ID: 4fb726f0fdcb155ad419913cea10dc4afd409d24
Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=d2d6bf864e52af8491a60dd507f85b74361f5da3
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1988
Bug-Debian: https://bugs.debian.org/714526
Last-Update: 2016-07-22
Patch-Name: control-persist-close-stderr.patch
Diffstat (limited to 'log.c')
-rw-r--r-- | log.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -343,7 +343,7 @@ log_change_level(LogLevel new_log_level) | |||
343 | int | 343 | int |
344 | log_is_on_stderr(void) | 344 | log_is_on_stderr(void) |
345 | { | 345 | { |
346 | return log_on_stderr; | 346 | return log_on_stderr && log_stderr_fd == STDERR_FILENO; |
347 | } | 347 | } |
348 | 348 | ||
349 | /* redirect what would usually get written to stderr to specified file */ | 349 | /* redirect what would usually get written to stderr to specified file */ |