diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:20:18 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:20:18 +1100 |
commit | 0059933c8d5f219c65a61df017225d9030ea3ae8 (patch) | |
tree | eecaf8c138c95d010d2ac2d73650340428f1f932 | |
parent | 81a05803d6cbf8bd5315d2cb18bcc32bb0869dd6 (diff) |
- markus@cvs.openbsd.org 2013/02/22 19:13:56
[sshconnect.c]
support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshconnect.c | 9 |
2 files changed, 11 insertions, 1 deletions
@@ -12,6 +12,9 @@ | |||
12 | [ssh.c readconf.c readconf.h] | 12 | [ssh.c readconf.c readconf.h] |
13 | Don't complain if IdentityFiles specified in system-wide configs are | 13 | Don't complain if IdentityFiles specified in system-wide configs are |
14 | missing. ok djm, deraadt. | 14 | missing. ok djm, deraadt. |
15 | - markus@cvs.openbsd.org 2013/02/22 19:13:56 | ||
16 | [sshconnect.c] | ||
17 | support ProxyCommand=- (stdin/out already point to the proxy); ok djm@ | ||
15 | 18 | ||
16 | 20130401 | 19 | 20130401 |
17 | - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h | 20 | - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h |
diff --git a/sshconnect.c b/sshconnect.c index 07800a65f..cf0711285 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.236 2012/09/14 16:51:34 markus Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.237 2013/02/22 19:13:56 markus 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 |
@@ -89,6 +89,13 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) | |||
89 | pid_t pid; | 89 | pid_t pid; |
90 | char *shell, strport[NI_MAXSERV]; | 90 | char *shell, strport[NI_MAXSERV]; |
91 | 91 | ||
92 | if (!strcmp(proxy_command, "-")) { | ||
93 | packet_set_connection(STDIN_FILENO, STDOUT_FILENO); | ||
94 | packet_set_timeout(options.server_alive_interval, | ||
95 | options.server_alive_count_max); | ||
96 | return 0; | ||
97 | } | ||
98 | |||
92 | if ((shell = getenv("SHELL")) == NULL || *shell == '\0') | 99 | if ((shell = getenv("SHELL")) == NULL || *shell == '\0') |
93 | shell = _PATH_BSHELL; | 100 | shell = _PATH_BSHELL; |
94 | 101 | ||