Attachment 3170 Details for Bug 2896 – openssh-proxyjump-canonicalization.patch

[patch] openssh-proxyjump-canonicalization.patch

openssh-proxyjump-canonicalization.patch (text/plain), 1.66 KB, created by Sven Wegener on 2018-08-18 20:02:41 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Sven Wegener

Created: 2018-08-18 20:02:41 AEST

Size: 1.66 KB

patch

obsolete

>From 0644ae32ef7168085004b2c1552f14dbdc45e504 Mon Sep 17 00:00:00 2001
>From: Sven Wegener <sven.wegener@stealer.net>
>Date: Tue, 19 Sep 2017 22:43:47 +0200
>Subject: [PATCH] ssh: do not fail DNS canonicalization lookup on ProxyJump
>
>Currently using ProxyJump with CanonicalizeHostname set to always,
>results in ssh exiting on DNS lookup failure. ProxyJump gets converted
>to ProxyCommand later in the code, so both should be treated equally.
>Use the direct variable, which covers both.
>
>Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
>---
> ssh.c        | 5 ++---
> ssh_config.5 | 4 +++-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/ssh.c b/ssh.c
>index ce628848..c3ccfce0 100644
>--- a/ssh.c
>+++ b/ssh.c
>@@ -1130,10 +1130,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);
>diff --git a/ssh_config.5 b/ssh_config.5
>index f499396a..3e428164 100644
>--- a/ssh_config.5
>+++ b/ssh_config.5
>@@ -290,7 +290,9 @@ hostname lookups.
> If set to
> .Cm yes
> then, for connections that do not use a
>-.Cm ProxyCommand ,
>+.Cm ProxyCommand
>+or
>+.Cm ProxyJump ,
> .Xr ssh 1
> will attempt to canonicalize the hostname specified on the command line
> using the

Actions: View | Diff

Attachments on bug 2896: 3170