diff options
| author |   beck <beck@openbsd.org> | 2020-01-05 16:28:22 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2020-01-05 16:28:22 +0000 |
| commit | 22f162ef2a4aa7ccdf0cdc3755f8a93dca027c67 (patch) | |
| tree | 42ea28bce040785da79057d548e49d16b556214e /usr.bin/ssh/ssh.c | |
| parent | In his original writeup, espie@ had the terse parenthetical remark (diff) | |
| download | wireguard-openbsd-22f162ef2a4aa7ccdf0cdc3755f8a93dca027c67.tar.xz wireguard-openbsd-22f162ef2a4aa7ccdf0cdc3755f8a93dca027c67.zip | |
fix CanonicalizeHostname, broken by rev 1.507
Issue noticed and reported by Pierre-Olivier Martel <pom@apple.com>
ok dtucker@ markus@ djm@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 255ab192fbd..1d01e011256 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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 @@ -1371,7 +1371,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); |