[openssh-commits] [openssh] 02/10: upstream: revise the fix for reversed arguments on

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit b8a4ca2ebfddab862f7eb1ea2a07fb9f70330429
Author: naddy at openbsd.org <naddy at openbsd.org>
Date:   Sat Jan 11 16:23:10 2020 +0000

    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
---
 sshconnect.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sshconnect.c b/sshconnect.c
index 40251ee0..2b9ce9dd 100644
--- 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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. */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.