tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2013/02/22 19:13:56 

[sshconnect.c]
     support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
This commit is contained in:
Darren Tucker 2013-04-05 11:20:00 +11:00
parent aefa368243
commit 5d1d9541a7
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@
[ssh.c readconf.c readconf.h] [ssh.c readconf.c readconf.h]
Don't complain if IdentityFiles specified in system-wide configs are Don't complain if IdentityFiles specified in system-wide configs are
missing. ok djm, deraadt. missing. ok djm, deraadt.
- markus@cvs.openbsd.org 2013/02/22 19:13:56
[sshconnect.c]
support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
20130401 20130401
- (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h

9
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.236 2012/09/14 16:51:34 markus Exp $ */ /* $OpenBSD: sshconnect.c,v 1.237 2013/02/22 19:13:56 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
@ -89,6 +89,13 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
pid_t pid; pid_t pid;
char *shell, strport[NI_MAXSERV]; char *shell, strport[NI_MAXSERV];
if (!strcmp(proxy_command, "-")) {
packet_set_connection(STDIN_FILENO, STDOUT_FILENO);
packet_set_timeout(options.server_alive_interval,
options.server_alive_count_max);
return 0;
}
if ((shell = getenv("SHELL")) == NULL || *shell == '\0') if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
shell = _PATH_BSHELL; shell = _PATH_BSHELL;