diff options
| author |   djm <djm@openbsd.org> | 2016-04-29 08:07:53 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-04-29 08:07:53 +0000 |
| commit | c01c3b24e6888a5533e8e29bc3aec4616a6c4183 (patch) | |
| tree | 768f6b96690f90d15afff3766561e05bd9c2d862 /usr.bin/ssh/ssh.c | |
| parent | When a group contains a non-existent user, make the warning (diff) | |
| download | wireguard-openbsd-c01c3b24e6888a5533e8e29bc3aec4616a6c4183.tar.xz wireguard-openbsd-c01c3b24e6888a5533e8e29bc3aec4616a6c4183.zip | |
close ControlPersist background process stderr when not in
debug mode or when logging to a file or syslog.
bz#1988 ok dtucker
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index ec8a5150f9d..623a611597d 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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 @@ -1346,7 +1346,7 @@ static void control_persist_detach(void) { pid_t pid; - int devnull; + int devnull, keep_stderr; debug("%s: backgrounding master process", __func__); @@ -1377,8 +1377,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); |