summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ssh.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh.c b/ssh.c
index 25397e8ea..3e8b1ebf2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -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,