upstream: revise the fix for reversed arguments on

expand_proxy_command()

Always put 'host' before 'host_arg' for consistency.  ok markus@ djm@

OpenBSD-Commit-ID: 1ba5b25472779f1b1957295fcc6907bb961472a3

diff --git a/sshconnect.c b/sshconnect.c
index 40251ee075bd8849a22dd6f442d8656ca3c04841..2b9ce9dddd1645e0c34107cccdab88fb4c7bc2f2 100644 (file)
--- a/sshconnect.c
+++ b/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
@@ -86,7 +86,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];
 
@@ -141,7 +141,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. */
@@ -224,7 +224,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. */