diff options
| author |   naddy <naddy@openbsd.org> | 2020-01-11 16:23:10 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2020-01-11 16:23:10 +0000 |
| commit | c140ebf1acff5d0f8e21e4330bdbbf7343c0a215 (patch) | |
| tree | 7d64ae62ddc7108c95e252d75902fe0225aa6723 /usr.bin/ssh/sshconnect.c | |
| parent | Print more tbl(7) details to help debugging: (diff) | |
| download | wireguard-openbsd-c140ebf1acff5d0f8e21e4330bdbbf7343c0a215.tar.xz wireguard-openbsd-c140ebf1acff5d0f8e21e4330bdbbf7343c0a215.zip | |
revise the fix for reversed arguments on expand_proxy_command()
Always put 'host' before 'host_arg' for consistency. ok markus@ djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 9a8e21219e6..df03c5b90d7 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.324 2020/01/09 03:28:38 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.325 2020/01/11 16:23:10 naddy Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -74,7 +74,7 @@ static void warn_changed_key(struct sshkey *); /* Expand a proxy command */ static char * expand_proxy_command(const char *proxy_command, const char *user, - const char *host_arg, const char *host, int port) + const char *host, const char *host_arg, int port) { char *tmp, *ret, strport[NI_MAXSERV]; @@ -129,7 +129,7 @@ ssh_proxy_fdpass_connect(struct ssh *ssh, const char *host, "proxy dialer: %.100s", strerror(errno)); command_string = expand_proxy_command(proxy_command, options.user, - host_arg, host, port); + host, host_arg, port); debug("Executing proxy dialer command: %.500s", command_string); /* Fork and execute the proxy command. */ @@ -212,7 +212,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg, strerror(errno)); command_string = expand_proxy_command(proxy_command, options.user, - host_arg, host, port); + host, host_arg, port); debug("Executing proxy command: %.500s", command_string); /* Fork and execute the proxy command. */ |