diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-04-29 08:07:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-04-29 18:09:02 +1000 |
commit | d2d6bf864e52af8491a60dd507f85b74361f5da3 (patch) | |
tree | aee80e780864479d2b477f7698adeecd47c5a5e8 /ssh.c | |
parent | 9ee692fa1146e887e008a2b9a3d3ea81770c9fc8 (diff) |
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 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.437 2016/03/07 19:02:43 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.438 2016/04/29 08:07:53 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1395,7 +1395,7 @@ static void | |||
1395 | control_persist_detach(void) | 1395 | control_persist_detach(void) |
1396 | { | 1396 | { |
1397 | pid_t pid; | 1397 | pid_t pid; |
1398 | int devnull; | 1398 | int devnull, keep_stderr; |
1399 | 1399 | ||
1400 | debug("%s: backgrounding master process", __func__); | 1400 | debug("%s: backgrounding master process", __func__); |
1401 | 1401 | ||
@@ -1426,8 +1426,10 @@ control_persist_detach(void) | |||
1426 | error("%s: open(\"/dev/null\"): %s", __func__, | 1426 | error("%s: open(\"/dev/null\"): %s", __func__, |
1427 | strerror(errno)); | 1427 | strerror(errno)); |
1428 | } else { | 1428 | } else { |
1429 | keep_stderr = log_is_on_stderr() && debug_flag; | ||
1429 | if (dup2(devnull, STDIN_FILENO) == -1 || | 1430 | if (dup2(devnull, STDIN_FILENO) == -1 || |
1430 | dup2(devnull, STDOUT_FILENO) == -1) | 1431 | dup2(devnull, STDOUT_FILENO) == -1 || |
1432 | (!keep_stderr && dup2(devnull, STDERR_FILENO) == -1)) | ||
1431 | error("%s: dup2: %s", __func__, strerror(errno)); | 1433 | error("%s: dup2: %s", __func__, strerror(errno)); |
1432 | if (devnull > STDERR_FILENO) | 1434 | if (devnull > STDERR_FILENO) |
1433 | close(devnull); | 1435 | close(devnull); |