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: Fix inverted logic for redirecting ProxyCommand stderr to 

/dev/null. Fixes mosh in proxycommand mode that was broken by the previous
ProxyCommand change that was reported by matthieu@. ok djm@ danj@

OpenBSD-Commit-ID: c6fc9641bc250221a0a81c6beb2e72d603f8add6
This commit is contained in:
dtucker@openbsd.org 2018-11-18 22:43:29 +00:00 committed by Damien Miller
parent ccef7c4faf
commit 7fca94edbe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.307 2018/11/16 06:17:38 djm Exp $ */ /* $OpenBSD: sshconnect.c,v 1.308 2018/11/18 22:43:29 dtucker 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
@ -163,7 +163,8 @@ ssh_proxy_fdpass_connect(struct ssh *ssh, const char *host, u_short port,
* Stderr is left for non-ControlPersist connections is so * Stderr is left for non-ControlPersist connections is so
* error messages may be printed on the user's terminal. * error messages may be printed on the user's terminal.
*/ */
if (debug_flag || !options.control_persist) if (!debug_flag && options.control_path != NULL &&
options.control_persist)
stderr_null(); stderr_null();
argv[0] = shell; argv[0] = shell;
@ -245,7 +246,8 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
* Stderr is left for non-ControlPersist connections is so * Stderr is left for non-ControlPersist connections is so
* error messages may be printed on the user's terminal. * error messages may be printed on the user's terminal.
*/ */
if (debug_flag || !options.control_persist) if (!debug_flag && options.control_path != NULL &&
options.control_persist)
stderr_null(); stderr_null();
argv[0] = shell; argv[0] = shell;