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: redirect stderr of ProxyCommands to /dev/null when ssh is 

started with ControlPersist; based on patch from Steffen Prohaska

OpenBSD-Commit-ID: 1bcaa14a03ae80369d31021271ec75dce2597957
This commit is contained in:
djm@openbsd.org 2018-11-16 06:17:38 +00:00 committed by Damien Miller
parent 15182fd968
commit ccef7c4faf
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.306 2018/10/15 11:28:50 florian Exp $ */ /* $OpenBSD: sshconnect.c,v 1.307 2018/11/16 06:17:38 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
@ -78,6 +78,7 @@ static int matching_host_key_dns = 0;
static pid_t proxy_command_pid = 0; static pid_t proxy_command_pid = 0;
/* import */ /* import */
extern int debug_flag;
extern Options options; extern Options options;
extern char *__progname; extern char *__progname;
@ -99,6 +100,24 @@ expand_proxy_command(const char *proxy_command, const char *user,
return ret; return ret;
} }
static void
stderr_null(void)
{
int devnull;
if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1) {
error("Can't open %s for stderr redirection: %s",
_PATH_DEVNULL, strerror(errno));
return;
}
if (devnull == STDERR_FILENO)
return;
if (dup2(devnull, STDERR_FILENO) == -1)
error("Cannot redirect stderr to %s", _PATH_DEVNULL);
if (devnull > STDERR_FILENO)
close(devnull);
}
/* /*
* Connect to the given ssh server using a proxy command that passes a * Connect to the given ssh server using a proxy command that passes a
* a connected fd back to us. * a connected fd back to us.
@ -141,9 +160,12 @@ ssh_proxy_fdpass_connect(struct ssh *ssh, const char *host, u_short port,
close(sp[0]); close(sp[0]);
/* /*
* Stderr is left as it is so that error messages get * Stderr is left for non-ControlPersist connections is so
* printed on the user's terminal. * error messages may be printed on the user's terminal.
*/ */
if (debug_flag || !options.control_persist)
stderr_null();
argv[0] = shell; argv[0] = shell;
argv[1] = "-c"; argv[1] = "-c";
argv[2] = command_string; argv[2] = command_string;
@ -219,8 +241,13 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
/* Cannot be 1 because pin allocated two descriptors. */ /* Cannot be 1 because pin allocated two descriptors. */
close(pout[1]); close(pout[1]);
/* Stderr is left as it is so that error messages get /*
printed on the user's terminal. */ * Stderr is left for non-ControlPersist connections is so
* error messages may be printed on the user's terminal.
*/
if (debug_flag || !options.control_persist)
stderr_null();
argv[0] = shell; argv[0] = shell;
argv[1] = "-c"; argv[1] = "-c";
argv[2] = command_string; argv[2] = command_string;