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