diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-04-26 03:36:03 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-04-26 06:38:21 +0200 |
| commit | c8eb3941758615c8284a48fff47872db926da63c (patch) | |
| tree | ad63338bccf37ee1b57e77a6e3a67b97954227b8 /ssh.c | |
| parent | upstream: remove duplicate signal.h include (diff) | |
| download | openssh-c8eb3941758615c8284a48fff47872db926da63c.tar.xz openssh-c8eb3941758615c8284a48fff47872db926da63c.zip | |
upstream: Check for ProxyJump=none in CanonicalizeHostname logic.
Previously ssh would incorrectly refuse to canonicalise the hostname
if ProxyJump was explicitly set to "none" when CanonicalizeHostname=yes
bz3567; ok dtucker
OpenBSD-Commit-ID: 80a58e43c3a32f97361282f756ec8d3f37989efd
Diffstat (limited to '')
| -rw-r--r-- | ssh.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.587 2023/03/30 07:19:50 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.588 2023/04/26 01:36:03 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -461,7 +461,7 @@ resolve_canonicalize(char **hostp, int port) * a proxy unless the user specifically requests so. */ direct = option_clear_or_none(options.proxy_command) && - options.jump_host == NULL; + option_clear_or_none(options.jump_host); if (!direct && options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS) return NULL; @@ -1200,7 +1200,7 @@ main(int ac, char **av) * CanonicalizeHostname=always */ direct = option_clear_or_none(options.proxy_command) && - options.jump_host == NULL; + option_clear_or_none(options.jump_host); if (addrs == NULL && config_has_permitted_cnames(&options) && (direct || options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) { if ((addrs = resolve_host(host, options.port, |