diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-04-29 10:07:53 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-04-29 10:09:02 +0200 |
| commit | d2d6bf864e52af8491a60dd507f85b74361f5da3 (patch) | |
| tree | aee80e780864479d2b477f7698adeecd47c5a5e8 /log.c | |
| parent | upstream commit (diff) | |
| download | openssh-d2d6bf864e52af8491a60dd507f85b74361f5da3.tar.xz openssh-d2d6bf864e52af8491a60dd507f85b74361f5da3.zip | |
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 @@ -/* $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 */ |