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 

transfer ownership of stdout to the session channel by
dup2'ing /dev/null to fd 1. This allows propagation of remote stdout close to
the local side; reported by David Newall, ok markus@

Upstream-ID: 8d9ac18a11d89e6b0415f0cbf67b928ac67f0e79
This commit is contained in:
djm@openbsd.org 2017-10-25 00:21:37 +00:00 committed by Damien Miller
parent 68af80e6fd
commit 4d5456c7de
1 changed files with 16 additions and 2 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.466 2017/10/23 05:08:00 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.467 2017/10/25 00:21:37 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
@ -1817,7 +1817,7 @@ ssh_session2_open(struct ssh *ssh)
static int static int
ssh_session2(struct ssh *ssh, struct passwd *pw) ssh_session2(struct ssh *ssh, struct passwd *pw)
{ {
int id = -1; int devnull, id = -1;
char *cp, *tun_fwd_ifname = NULL; char *cp, *tun_fwd_ifname = NULL;
/* XXX should be pre-session */ /* XXX should be pre-session */
@ -1900,6 +1900,20 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
options.permit_local_command) options.permit_local_command)
ssh_local_cmd(options.local_command); ssh_local_cmd(options.local_command);
/*
* stdout is now owned by the session channel; clobber it here
* so future channel closes are propagated to the local fd.
* NB. this can only happen after LocalCommand has completed,
* as it may want to write to stdout.
*/
if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1)
error("%s: open %s: %s", __func__,
_PATH_DEVNULL, strerror(errno));
if (dup2(devnull, STDOUT_FILENO) < 0)
fatal("%s: dup2() stdout failed", __func__);
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
* forwarding requests, then let ssh continue in the background. * forwarding requests, then let ssh continue in the background.