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 commit 

better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in
 hostname canonicalisation - treat them as already canonical and remove the
 trailing '.' before matching ssh_config; ok markus@

Upstream-ID: f7619652e074ac3febe8363f19622aa4853b679a
This commit is contained in:
djm@openbsd.org 2015-10-16 18:40:49 +00:00 committed by Damien Miller
parent e92c499a75
commit 5ee0063f02
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.427 2015/10/15 23:51:40 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.428 2015/10/16 18:40:49 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
@ -404,6 +404,17 @@ resolve_canonicalize(char **hostp, int port)
return addrs; return addrs;
} }
/* If domain name is anchored, then resolve it now */
if ((*hostp)[strlen(*hostp) - 1] == '.') {
debug3("%s: name is fully qualified", __func__);
fullhost = xstrdup(*hostp);
if ((addrs = resolve_host(fullhost, port, 0,
newname, sizeof(newname))) != NULL)
goto found;
free(fullhost);
goto notfound;
}
/* Don't apply canonicalization to sufficiently-qualified hostnames */ /* Don't apply canonicalization to sufficiently-qualified hostnames */
ndots = 0; ndots = 0;
for (cp = *hostp; *cp != '\0'; cp++) { for (cp = *hostp; *cp != '\0'; cp++) {
@ -427,6 +438,7 @@ resolve_canonicalize(char **hostp, int port)
free(fullhost); free(fullhost);
continue; continue;
} }
found:
/* Remove trailing '.' */ /* Remove trailing '.' */
fullhost[strlen(fullhost) - 1] = '\0'; fullhost[strlen(fullhost) - 1] = '\0';
/* Follow CNAME if requested */ /* Follow CNAME if requested */
@ -438,6 +450,7 @@ resolve_canonicalize(char **hostp, int port)
*hostp = fullhost; *hostp = fullhost;
return addrs; return addrs;
} }
notfound:
if (!options.canonicalize_fallback_local) if (!options.canonicalize_fallback_local)
fatal("%s: Could not resolve host \"%s\"", __progname, *hostp); fatal("%s: Could not resolve host \"%s\"", __progname, *hostp);
debug2("%s: host %s not found in any suffix", __func__, *hostp); debug2("%s: host %s not found in any suffix", __func__, *hostp);