diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-04-29 08:07:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-04-29 18:09:02 +1000 |
commit | d2d6bf864e52af8491a60dd507f85b74361f5da3 (patch) | |
tree | aee80e780864479d2b477f7698adeecd47c5a5e8 /log.c | |
parent | 9ee692fa1146e887e008a2b9a3d3ea81770c9fc8 (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
Diffstat (limited to 'log.c')
-rw-r--r-- | log.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: log.c,v 1.46 2015/07/08 19:04:21 markus Exp $ */ | 1 | /* $OpenBSD: log.c,v 1.47 2016/04/29 08:07:53 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -342,7 +342,7 @@ log_change_level(LogLevel new_log_level) | |||
342 | int | 342 | int |
343 | log_is_on_stderr(void) | 343 | log_is_on_stderr(void) |
344 | { | 344 | { |
345 | return log_on_stderr; | 345 | return log_on_stderr && log_stderr_fd == STDERR_FILENO; |
346 | } | 346 | } |
347 | 347 | ||
348 | /* redirect what would usually get written to stderr to specified file */ | 348 | /* redirect what would usually get written to stderr to specified file */ |