summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sshconnect.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 40251ee07..2b9ce9ddd 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.324 2020/01/09 03:28:38 djm Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.325 2020/01/11 16:23:10 naddy 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
@@ -86,7 +86,7 @@ static void warn_changed_key(struct sshkey *);
86/* Expand a proxy command */ 86/* Expand a proxy command */
87static char * 87static char *
88expand_proxy_command(const char *proxy_command, const char *user, 88expand_proxy_command(const char *proxy_command, const char *user,
89 const char *host_arg, const char *host, int port) 89 const char *host, const char *host_arg, int port)
90{ 90{
91 char *tmp, *ret, strport[NI_MAXSERV]; 91 char *tmp, *ret, strport[NI_MAXSERV];
92 92
@@ -141,7 +141,7 @@ ssh_proxy_fdpass_connect(struct ssh *ssh, const char *host,
141 "proxy dialer: %.100s", strerror(errno)); 141 "proxy dialer: %.100s", strerror(errno));
142 142
143 command_string = expand_proxy_command(proxy_command, options.user, 143 command_string = expand_proxy_command(proxy_command, options.user,
144 host_arg, host, port); 144 host, host_arg, port);
145 debug("Executing proxy dialer command: %.500s", command_string); 145 debug("Executing proxy dialer command: %.500s", command_string);
146 146
147 /* Fork and execute the proxy command. */ 147 /* Fork and execute the proxy command. */
@@ -224,7 +224,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg,
224 strerror(errno)); 224 strerror(errno));
225 225
226 command_string = expand_proxy_command(proxy_command, options.user, 226 command_string = expand_proxy_command(proxy_command, options.user,
227 host_arg, host, port); 227 host, host_arg, port);
228 debug("Executing proxy command: %.500s", command_string); 228 debug("Executing proxy command: %.500s", command_string);
229 229
230 /* Fork and execute the proxy command. */ 230 /* Fork and execute the proxy command. */