diff options
| author |   djm <djm@openbsd.org> | 2019-09-13 04:27:35 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-09-13 04:27:35 +0000 |
| commit | 2e5f52195db1f07c4b0e675efe9aa38409e9b42b (patch) | |
| tree | 7db3b28991e43fa2055b4e8a051a472a89952f81 /usr.bin/ssh/ssh.c | |
| parent | clarify that ConnectTimeout applies both to the TCP connection and to (diff) | |
| download | wireguard-openbsd-2e5f52195db1f07c4b0e675efe9aa38409e9b42b.tar.xz wireguard-openbsd-2e5f52195db1f07c4b0e675efe9aa38409e9b42b.zip | |
allow %n to be expanded in ProxyCommand strings
From Zachary Harmany via github.com/openssh/openssh-portable/pull/118
ok dtucker@
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 95f05c59d76..282d31f1a4e 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.506 2019/09/06 14:45:34 naddy Exp $ */ +/* $OpenBSD: ssh.c,v 1.507 2019/09/13 04:27:35 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1348,7 +1348,7 @@ main(int ac, char **av) timeout_ms = options.connection_timeout * 1000; /* Open a connection to the remote host. */ - if (ssh_connect(ssh, host, addrs, &hostaddr, options.port, + if (ssh_connect(ssh, host_arg, host, addrs, &hostaddr, options.port, options.address_family, options.connection_attempts, &timeout_ms, options.tcp_keep_alive) != 0) exit(255); |