RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-03-25 04:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Treat connections with ProxyJump specified the same as ones

Browse Source 
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

OpenBSD-Commit-ID: 527ff501cf98bf65fb4b29ed0cb847dda10f4d37
This commit is contained in:
djm@openbsd.org 2018-09-21 03:11:36 +00:00 committed by Damien Miller
parent 0cbed248ed
commit 383a33d160
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssh.c
View File

@ -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> * 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
@ -1137,10 +1137,9 @@ main(int ac, char **av)
if (addrs == NULL && options.num_permitted_cnames != 0 && (direct || if (addrs == NULL && options.num_permitted_cnames != 0 && (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,
option_clear_or_none(options.proxy_command), direct, cname, sizeof(cname))) == NULL) {
cname, sizeof(cname))) == NULL) {
/* Don't fatal proxied host names not in the DNS */ /* 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 */ cleanup_exit(255); /* logged in resolve_host */
} else } else
check_follow_cname(direct, &host, cname); check_follow_cname(direct, &host, cname);

8
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.283 2018/09/20 06:58:48 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.284 2018/09/21 03:11:36 djm Exp $
.Dd $Mdocdate: September 20 2018 $ .Dd $Mdocdate: September 21 2018 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -290,7 +290,9 @@ hostname lookups.
If set to If set to
.Cm yes .Cm yes
then, for connections that do not use a then, for connections that do not use a
.Cm ProxyCommand , .Cm ProxyCommand
or
.Cm ProxyJump ,
.Xr ssh 1 .Xr ssh 1
will attempt to canonicalize the hostname specified on the command line will attempt to canonicalize the hostname specified on the command line
using the using the