From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 9 Jan 2020 03:28:38 +0000 (+0000)
Subject: upstream: fix reversed arguments on expand_proxy_command(); spotted
X-Git-Tag: V_8_2_P1~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed3ad71b17adcd1fb4431d145f53cee1c6a1135e;p=thirdparty%2Fopenssh-portable.git

upstream: fix reversed arguments on expand_proxy_command(); spotted

by anton@

OpenBSD-Commit-ID: db1c32478a01dfbc9c4db171de0f25907bea5775
---

diff --git a/sshconnect.c b/sshconnect.c
index 0b33ea58b..40251ee07 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.323 2019/11/13 04:47:52 deraadt Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.324 2020/01/09 03:28:38 djm 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, const char *host_arg, int port)
+    const char *host_arg, const char *host, int port)
 {
 	char *tmp, *ret, strport[NI_MAXSERV];