View | Details | Raw Unified | Return to bug 2896
Collapse All | Expand All

(-)a/ssh.c (-3 / +2 lines)
Lines 1130-1139 main(int ac, char **av) Link Here
1130
	if (addrs == NULL && options.num_permitted_cnames != 0 && (direct ||
1130
	if (addrs == NULL && options.num_permitted_cnames != 0 && (direct ||
1131
	    options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) {
1131
	    options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) {
1132
		if ((addrs = resolve_host(host, options.port,
1132
		if ((addrs = resolve_host(host, options.port,
1133
		    option_clear_or_none(options.proxy_command),
1133
		    direct, cname, sizeof(cname))) == NULL) {
1134
		    cname, sizeof(cname))) == NULL) {
1135
			/* Don't fatal proxied host names not in the DNS */
1134
			/* Don't fatal proxied host names not in the DNS */
1136
			if (option_clear_or_none(options.proxy_command))
1135
			if (direct)
1137
				cleanup_exit(255); /* logged in resolve_host */
1136
				cleanup_exit(255); /* logged in resolve_host */
1138
		} else
1137
		} else
1139
			check_follow_cname(direct, &host, cname);
1138
			check_follow_cname(direct, &host, cname);
(-)a/ssh_config.5 (-1 / +3 lines)
Lines 290-296 hostname lookups. Link Here
290
If set to
290
If set to
291
.Cm yes
291
.Cm yes
292
then, for connections that do not use a
292
then, for connections that do not use a
293
.Cm ProxyCommand ,
293
.Cm ProxyCommand
294
or
295
.Cm ProxyJump ,
294
.Xr ssh 1
296
.Xr ssh 1
295
will attempt to canonicalize the hostname specified on the command line
297
will attempt to canonicalize the hostname specified on the command line
296
using the
298
using the

Return to bug 2896