diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-10-25 00:21:37 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-10-25 12:26:21 +1100 |
commit | 4d5456c7de108e17603a0920c4d15bca87244921 (patch) | |
tree | fbeae4ad24e358172f127c7189e8dcd6e1e3ce63 | |
parent | 68af80e6fdeaeb79432209db614386ff0f37e75f (diff) |
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
-rw-r--r-- | ssh.c | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.466 2017/10/23 05:08:00 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.467 2017/10/25 00:21:37 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 |
@@ -1817,7 +1817,7 @@ ssh_session2_open(struct ssh *ssh) | |||
1817 | static int | 1817 | static int |
1818 | ssh_session2(struct ssh *ssh, struct passwd *pw) | 1818 | ssh_session2(struct ssh *ssh, struct passwd *pw) |
1819 | { | 1819 | { |
1820 | int id = -1; | 1820 | int devnull, id = -1; |
1821 | char *cp, *tun_fwd_ifname = NULL; | 1821 | char *cp, *tun_fwd_ifname = NULL; |
1822 | 1822 | ||
1823 | /* XXX should be pre-session */ | 1823 | /* XXX should be pre-session */ |
@@ -1901,6 +1901,20 @@ ssh_session2(struct ssh *ssh, struct passwd *pw) | |||
1901 | ssh_local_cmd(options.local_command); | 1901 | ssh_local_cmd(options.local_command); |
1902 | 1902 | ||
1903 | /* | 1903 | /* |
1904 | * stdout is now owned by the session channel; clobber it here | ||
1905 | * so future channel closes are propagated to the local fd. | ||
1906 | * NB. this can only happen after LocalCommand has completed, | ||
1907 | * as it may want to write to stdout. | ||
1908 | */ | ||
1909 | if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1) | ||
1910 | error("%s: open %s: %s", __func__, | ||
1911 | _PATH_DEVNULL, strerror(errno)); | ||
1912 | if (dup2(devnull, STDOUT_FILENO) < 0) | ||
1913 | fatal("%s: dup2() stdout failed", __func__); | ||
1914 | if (devnull > STDERR_FILENO) | ||
1915 | close(devnull); | ||
1916 | |||
1917 | /* | ||
1904 | * If requested and we are not interested in replies to remote | 1918 | * If requested and we are not interested in replies to remote |
1905 | * forwarding requests, then let ssh continue in the background. | 1919 | * forwarding requests, then let ssh continue in the background. |
1906 | */ | 1920 | */ |