diff options
| author |   djm <djm@openbsd.org> | 2018-09-21 03:11:36 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-09-21 03:11:36 +0000 |
| commit | c751614a1528da5e3a31a3c1465ec7c780811855 (patch) | |
| tree | c9f1117aec0dd2cd2b3724823175f231412933e5 /usr.bin/ssh/ssh.c | |
| parent | U-Boot 2018.05 and later will attempt to load a dtb for PocketBeagle if (diff) | |
| download | wireguard-openbsd-c751614a1528da5e3a31a3c1465ec7c780811855.tar.xz wireguard-openbsd-c751614a1528da5e3a31a3c1465ec7c780811855.zip | |
Treat connections with ProxyJump specified the same as ones with a
ProxyCommand set with regards to hostname canonicalisation (i.e.
don't try to canonicalise the hostname unless CanonicalizeHostname
is set to 'always').
Patch from Sven Wegener via bz#2896
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 358ac5a45c7..d96fba9b401 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.492 2018/09/20 03:31:49 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.493 2018/09/21 03:11:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1113,10 +1113,9 @@ main(int ac, char **av) if (addrs == NULL && options.num_permitted_cnames != 0 && (direct || options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) { if ((addrs = resolve_host(host, options.port, - option_clear_or_none(options.proxy_command), - cname, sizeof(cname))) == NULL) { + direct, cname, sizeof(cname))) == NULL) { /* Don't fatal proxied host names not in the DNS */ - if (option_clear_or_none(options.proxy_command)) + if (direct) cleanup_exit(255); /* logged in resolve_host */ } else check_follow_cname(direct, &host, cname); |