From 2ab335712d084d9ccaf3f53afc3fa9535329da87 Mon Sep 17 00:00:00 2001 From: "beck@openbsd.org" Date: Sun, 5 Jan 2020 16:28:22 +0000 Subject: upstream: fix CanonicalizeHostname, broken by rev 1.507 Issue noticed and reported by Pierre-Olivier Martel 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 12760af29..947558d1c 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 * Copyright (c) 1995 Tatu Ylonen , 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); -- cgit v1.2.3