summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-04-29 08:07:53 +0000
committerDamien Miller <djm@mindrot.org>2016-04-29 18:09:02 +1000
commitd2d6bf864e52af8491a60dd507f85b74361f5da3 (patch)
treeaee80e780864479d2b477f7698adeecd47c5a5e8 /log.c
parent9ee692fa1146e887e008a2b9a3d3ea81770c9fc8 (diff)
downloadopenssh-git-d2d6bf864e52af8491a60dd507f85b74361f5da3.tar.gz
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/log.c b/log.c
index ad12930e..277afda8 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 */