From: David van Moolenbroek <david@minix3.org>
Date: Thu, 10 Jun 2010 11:14:36 +0000 (+0000)
Subject: Change default hostname resolution order
X-Git-Tag: v3.1.8~459
X-Git-Url: http://zhaoyanbai.com/repos/%22/xml/v3/zones/static/mult.png?a=commitdiff_plain;h=2758519ed2d4f1931a30e63ef94060bd693d7eab;p=minix.git

Change default hostname resolution order

Hostnames that contain at least one period, are now first attempted
to be resolved as FQDNs, before adding local domains is tried.
---

diff --git a/lib/libc/ip/res_query.c b/lib/libc/ip/res_query.c
index 2fa6ce2ac..7f8f57456 100644
--- a/lib/libc/ip/res_query.c
+++ b/lib/libc/ip/res_query.c
@@ -175,7 +175,17 @@ res_search(name, class, type, answer, anslen)
 		return (res_query(cp, class, type, answer, anslen));
 
 	/*
-	 * We do at least one level of search if
+	 * First try the name as fully-qualified, but only if it contained
+	 * at least one dot (even trailing). This is purely a heuristic; we
+	 * assume that any reasonable query about a top-level domain (for
+	 * servers, SOA, etc) will not use res_search.
+	 */
+	if (n && (ret = res_querydomain(name, (char *)NULL, class, type,
+	    answer, anslen)) > 0)
+		return (ret);
+
+	/*
+	 * If the FQDN lookup failed, we do at least one level of search if
 	 *	- there is no dot and RES_DEFNAME is set, or
 	 *	- there is at least one dot, there is no trailing dot,
 	 *	  and RES_DNSRCH is set.
@@ -209,16 +219,6 @@ res_search(name, class, type, answer, anslen)
 		    (_res.options & RES_DNSRCH) == 0)
 			break;
 	}
-	/*
-	 * If the search/default failed, try the name as fully-qualified,
-	 * but only if it contained at least one dot (even trailing).
-	 * This is purely a heuristic; we assume that any reasonable query
-	 * about a top-level domain (for servers, SOA, etc) will not use
-	 * res_search.
-	 */
-	if (n && (ret = res_querydomain(name, (char *)NULL, class, type,
-	    answer, anslen)) > 0)
-		return (ret);
 	if (got_nodata)
 		h_errno = NO_DATA;
 	return (-1);