[openssh-commits] [openssh] 01/03: upstream: fix CanonicalizeHostname, broken by rev 1.507

[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 2ab335712d084d9ccaf3f53afc3fa9535329da87
Author: beck at openbsd.org <beck at openbsd.org>
Date:   Sun Jan 5 16:28:22 2020 +0000

    upstream: fix CanonicalizeHostname, broken by rev 1.507
    
    Issue noticed and reported by Pierre-Olivier Martel <pom at apple.com>
    ok dtucker@ markus@ djm@
    
    OpenBSD-Commit-ID: 749f3168ec520609c35b0c4e1984e5fa47f16094
---
 ssh.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssh.c b/ssh.c
index 12760af2..947558d1 100644
--- 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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);

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