tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 14:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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
This commit is contained in:
djm@openbsd.org 2016-04-29 08:07:53 +00:00 committed by Damien Miller
parent 9ee692fa11
commit d2d6bf864e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
log.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -342,7 +342,7 @@ log_change_level(LogLevel new_log_level)
int int
log_is_on_stderr(void) 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 */ /* redirect what would usually get written to stderr to specified file */

8
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1395,7 +1395,7 @@ static void
control_persist_detach(void) control_persist_detach(void)
{ {
pid_t pid; pid_t pid;
int devnull; int devnull, keep_stderr;
debug("%s: backgrounding master process", __func__); debug("%s: backgrounding master process", __func__);
@ -1426,8 +1426,10 @@ control_persist_detach(void)
error("%s: open(\"/dev/null\"): %s", __func__, error("%s: open(\"/dev/null\"): %s", __func__,
strerror(errno)); strerror(errno));
} else { } else {
keep_stderr = log_is_on_stderr() && debug_flag;
if (dup2(devnull, STDIN_FILENO) == -1 || 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)); error("%s: dup2: %s", __func__, strerror(errno));
if (devnull > STDERR_FILENO) if (devnull > STDERR_FILENO)
close(devnull); close(devnull);