tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2023-04-26 01:36:03 +00:00 committed by Damien Miller
parent ac383f3a5c
commit c8eb394175
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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. * a proxy unless the user specifically requests so.
*/ */
direct = option_clear_or_none(options.proxy_command) && direct = option_clear_or_none(options.proxy_command) &&
options.jump_host == NULL; option_clear_or_none(options.jump_host);
if (!direct && if (!direct &&
options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS) options.canonicalize_hostname != SSH_CANONICALISE_ALWAYS)
return NULL; return NULL;
@ -1200,7 +1200,7 @@ main(int ac, char **av)
* CanonicalizeHostname=always * CanonicalizeHostname=always
*/ */
direct = option_clear_or_none(options.proxy_command) && 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 || if (addrs == NULL && config_has_permitted_cnames(&options) && (direct ||
options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) { options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) {
if ((addrs = resolve_host(host, options.port, if ((addrs = resolve_host(host, options.port,