upstream: fix CanonicalizeHostname, broken by rev 1.507

Issue noticed and reported by Pierre-Olivier Martel <pom@apple.com>
ok dtucker@ markus@ djm@

OpenBSD-Commit-ID: 749f3168ec520609c35b0c4e1984e5fa47f16094

diff --git a/ssh.c b/ssh.c
index 12760af298ee8aca918e1b70a379b1c229dcf913..947558d1c3ef1c1662020e80314533e66467cd46 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.510 2019/12/21 02:19:13 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.511 2020/01/05 16:28:22 beck Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1392,7 +1392,7 @@ main(int ac, char **av)
        timeout_ms = options.connection_timeout * 1000;
 
        /* Open a connection to the remote host. */
-       if (ssh_connect(ssh, host_arg, host, addrs, &hostaddr, options.port,
+       if (ssh_connect(ssh, host, host_arg, addrs, &hostaddr, options.port,
            options.address_family, options.connection_attempts,
            &timeout_ms, options.tcp_keep_alive) != 0)
                exit(255);