tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: close stdout/stderr after "ssh -f ..." forking 

bz#3137, ok markus

OpenBSD-Commit-ID: e2d83cc4dea1665651a7aa924ad1ed6bcaaab3e2
This commit is contained in:
djm@openbsd.org 2020-09-20 23:31:46 +00:00 committed by Damien Miller
parent 53a33a0d74
commit d14fe25e6c
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.534 2020/07/31 04:19:37 dtucker Exp $ */ /* $OpenBSD: ssh.c,v 1.535 2020/09/20 23:31:46 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
@ -1745,12 +1745,25 @@ control_persist_detach(void)
static void static void
fork_postauth(void) fork_postauth(void)
{ {
int devnull, keep_stderr;
if (need_controlpersist_detach) if (need_controlpersist_detach)
control_persist_detach(); control_persist_detach();
debug("forking to background"); debug("forking to background");
fork_after_authentication_flag = 0; fork_after_authentication_flag = 0;
if (daemon(1, 1) == -1) if (daemon(1, 1) == -1)
fatal("daemon() failed: %.200s", strerror(errno)); fatal("daemon() failed: %.200s", strerror(errno));
if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1)
error("%s: open %s: %s", __func__,
_PATH_DEVNULL, strerror(errno));
else {
keep_stderr = log_is_on_stderr() && debug_flag;
if (dup2(devnull, STDOUT_FILENO) == -1 ||
(!keep_stderr && dup2(devnull, STDOUT_FILENO) == -1))
fatal("%s: dup2() stdio failed", __func__);
if (devnull > STDERR_FILENO)
close(devnull);
}
} }
static void static void
@ -2149,13 +2162,15 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
* as it may want to write to stdout. * as it may want to write to stdout.
*/ */
if (!need_controlpersist_detach) { if (!need_controlpersist_detach) {
if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1) if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1) {
error("%s: open %s: %s", __func__, error("%s: open %s: %s", __func__,
_PATH_DEVNULL, strerror(errno)); _PATH_DEVNULL, strerror(errno));
if (dup2(devnull, STDOUT_FILENO) == -1) } else {
fatal("%s: dup2() stdout failed", __func__); if (dup2(devnull, STDOUT_FILENO) == -1)
if (devnull > STDERR_FILENO) fatal("%s: dup2() stdout failed", __func__);
close(devnull); if (devnull > STDERR_FILENO)
close(devnull);
}
} }
/* /*