Author: ume
Date: Mon Dec 28 03:26:16 2015
New Revision: 292824
URL: https://svnweb.freebsd.org/changeset/base/292824
Log:
MFC r292539:
If we end up following a CNAME chain that does not find
any data return that instead of internal error.
PR: 156684
Modified:
stable/10/lib/libc/net/getaddrinfo.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/net/getaddrinfo.c
==============================================================================
--- stable/10/lib/libc/net/getaddrinfo.c Mon Dec 28 02:43:12 2015
(r292823)
+++ stable/10/lib/libc/net/getaddrinfo.c Mon Dec 28 03:26:16 2015
(r292824)
@@ -2166,7 +2166,11 @@ getanswer(const querybuf *answer, int an
return sentinel.ai_next;
}
- RES_SET_H_ERRNO(res, NO_RECOVERY);
+ /*
+ * We could have walked a CNAME chain, but the ultimate target
+ * may not have what we looked for.
+ */
+ RES_SET_H_ERRNO(res, ntohs(hp->ancount) > 0 ? NO_DATA : NO_RECOVERY);
return NULL;
}
@@ -2343,6 +2347,7 @@ _dns_getaddrinfo(void *rv, void *cb_data
if (sentinel.ai_next == NULL)
switch (res->res_h_errno) {
case HOST_NOT_FOUND:
+ case NO_DATA:
return NS_NOTFOUND;
case TRY_AGAIN:
return NS_TRYAGAIN;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
