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: dup stdout/in for proxycommand=-, otherwise stdout might 

be redirected to /dev/null; ok djm@

OpenBSD-Commit-ID: 97dfce4c47ed4055042de8ebde85b7d88793e595
This commit is contained in:
markus@openbsd.org 2019-02-27 19:37:01 +00:00 committed by Damien Miller
parent 9b61130fbd
commit 8e7bac35aa
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.313 2019/02/01 03:52:23 dtucker Exp $ */ /* $OpenBSD: sshconnect.c,v 1.314 2019/02/27 19:37:01 markus 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
@ -547,12 +547,20 @@ ssh_connect(struct ssh *ssh, const char *host, struct addrinfo *addrs,
struct sockaddr_storage *hostaddr, u_short port, int family, struct sockaddr_storage *hostaddr, u_short port, int family,
int connection_attempts, int *timeout_ms, int want_keepalive) int connection_attempts, int *timeout_ms, int want_keepalive)
{ {
int in, out;
if (options.proxy_command == NULL) { if (options.proxy_command == NULL) {
return ssh_connect_direct(ssh, host, addrs, hostaddr, port, return ssh_connect_direct(ssh, host, addrs, hostaddr, port,
family, connection_attempts, timeout_ms, want_keepalive); family, connection_attempts, timeout_ms, want_keepalive);
} else if (strcmp(options.proxy_command, "-") == 0) { } else if (strcmp(options.proxy_command, "-") == 0) {
if ((ssh_packet_set_connection(ssh, if ((in = dup(STDIN_FILENO)) < 0 ||
STDIN_FILENO, STDOUT_FILENO)) == NULL) (out = dup(STDOUT_FILENO)) < 0) {
if (in >= 0)
close(in);
error("%s: dup() in/out failed", __func__);
return -1; /* ssh_packet_set_connection logs error */
}
if ((ssh_packet_set_connection(ssh, in, out)) == NULL)
return -1; /* ssh_packet_set_connection logs error */ return -1; /* ssh_packet_set_connection logs error */
return 0; return 0;
} else if (options.proxy_use_fdpass) { } else if (options.proxy_use_fdpass) {