diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-16 13:50:50 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-16 13:50:50 +0100 |
commit | 328b60656f29db6306994d7498dede386ec2d1c3 (patch) | |
tree | 7d3a4fd1eb06c355e7122b89b408b51b0b9b6c9b /sshconnect.c | |
parent | 91c1846f2f94bc944f5e8f53b9903cb59ca42adc (diff) | |
parent | 79524838f0d5eb1cdf9fc268ec4c0bce46ccb67f (diff) |
merge 6.2p2
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 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 | ||