diff options
| author | beck@openbsd.org <beck@openbsd.org> | 2020-01-05 17:28:22 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-06 03:12:46 +0100 |
| commit | 2ab335712d084d9ccaf3f53afc3fa9535329da87 (patch) | |
| tree | 3aa48817f916a718ac54a8ce16de8cc66c3efcfd /ssh.c | |
| parent | Fix typo: 'you' -> 'your'. (diff) | |
| download | openssh-2ab335712d084d9ccaf3f53afc3fa9535329da87.tar.xz openssh-2ab335712d084d9ccaf3f53afc3fa9535329da87.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |