diff options
author | djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> | 2017-11-01 00:04:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-11-01 11:08:56 +1100 |
commit | 939b30ba23848b572e15bf92f0f1a3d9cf3acc2b (patch) | |
tree | 4caeb4111553d39035d4628ab21bebdbb423dc17 | |
parent | f21455a084f9cc3942cf1bde64055a4916849fed (diff) |
upstream commit
fix broken stdout in ControlPersist mode, introduced by me in
r1.467 and reported by Alf Schlichting
OpenBSD-Commit-ID: 3750a16e02108fc25f747e4ebcedb7123c1ef509
-rw-r--r-- | ssh.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.468 2017/10/27 01:57:06 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.469 2017/11/01 00:04:15 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 |
@@ -1906,13 +1906,15 @@ ssh_session2(struct ssh *ssh, struct passwd *pw) | |||
1906 | * NB. this can only happen after LocalCommand has completed, | 1906 | * NB. this can only happen after LocalCommand has completed, |
1907 | * as it may want to write to stdout. | 1907 | * as it may want to write to stdout. |
1908 | */ | 1908 | */ |
1909 | if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1) | 1909 | if (!need_controlpersist_detach) { |
1910 | error("%s: open %s: %s", __func__, | 1910 | if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1) |
1911 | _PATH_DEVNULL, strerror(errno)); | 1911 | error("%s: open %s: %s", __func__, |
1912 | if (dup2(devnull, STDOUT_FILENO) < 0) | 1912 | _PATH_DEVNULL, strerror(errno)); |
1913 | fatal("%s: dup2() stdout failed", __func__); | 1913 | if (dup2(devnull, STDOUT_FILENO) < 0) |
1914 | if (devnull > STDERR_FILENO) | 1914 | fatal("%s: dup2() stdout failed", __func__); |
1915 | close(devnull); | 1915 | if (devnull > STDERR_FILENO) |
1916 | close(devnull); | ||
1917 | } | ||
1916 | 1918 | ||
1917 | /* | 1919 | /* |
1918 | * If requested and we are not interested in replies to remote | 1920 | * If requested and we are not interested in replies to remote |