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 commit 

fix broken stdout in ControlPersist mode, introduced by me in
r1.467 and reported by Alf Schlichting

OpenBSD-Commit-ID: 3750a16e02108fc25f747e4ebcedb7123c1ef509
This commit is contained in:
djm@openbsd.org@openbsd.org 2017-11-01 00:04:15 +00:00 committed by Damien Miller
parent f21455a084
commit 939b30ba23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.468 2017/10/27 01:57:06 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.469 2017/11/01 00:04:15 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
@ -1906,13 +1906,15 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
* NB. this can only happen after LocalCommand has completed, * NB. this can only happen after LocalCommand has completed,
* as it may want to write to stdout. * as it may want to write to stdout.
*/ */
if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1) if (!need_controlpersist_detach) {
error("%s: open %s: %s", __func__, if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1)
_PATH_DEVNULL, strerror(errno)); error("%s: open %s: %s", __func__,
if (dup2(devnull, STDOUT_FILENO) < 0) _PATH_DEVNULL, strerror(errno));
fatal("%s: dup2() stdout failed", __func__); if (dup2(devnull, STDOUT_FILENO) < 0)
if (devnull > STDERR_FILENO) fatal("%s: dup2() stdout failed", __func__);
close(devnull); if (devnull > STDERR_FILENO)
close(devnull);
}
/* /*
* If requested and we are not interested in replies to remote * If requested and we are not interested in replies to remote