diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:20:00 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:20:00 +1100 |
| commit | 5d1d9541a7c83963cd887b6b36e25b46463a05d4 (patch) | |
| tree | 6fc617d7a3e25d778d8d6259411df46dc503cd24 /sshconnect.c | |
| parent | aefa3682431f59cf1ad9a0f624114b135135aa44 (diff) | |
| download | openssh-git-5d1d9541a7c83963cd887b6b36e25b46463a05d4.tar.gz | |
- markus@cvs.openbsd.org 2013/02/22 19:13:56
[sshconnect.c]
support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c index 07800a65..cf071128 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -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> * 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; 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') shell = _PATH_BSHELL; |