Author: aurel32
Date: 2012-02-02 00:14:08 +0000 (Thu, 02 Feb 2012)
New Revision: 5147
Added:
glibc-package/trunk/debian/patches/any/submitted-resolv-first-query-failure.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/submitted-resolv-first-query-failure.diff: new patch to fix
resolving issues with broken servers returning NOTIMP or FORMERR to AAAA
queries. Closes: #658171.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-02-01 22:04:02 UTC (rev
5146)
+++ glibc-package/trunk/debian/changelog 2012-02-02 00:14:08 UTC (rev
5147)
@@ -2,6 +2,9 @@
[ Aurelien Jarno ]
* sysdeps/kfreebsd.mk: also symlink x86 directory.
+ * patches/any/submitted-resolv-first-query-failure.diff: new patch to fix
+ resolving issues with broken servers returning NOTIMP or FORMERR to AAAA
+ queries. Closes: #658171.
-- Aurelien Jarno <[email protected]> Mon, 30 Jan 2012 23:01:02 +0100
Added:
glibc-package/trunk/debian/patches/any/submitted-resolv-first-query-failure.diff
===================================================================
---
glibc-package/trunk/debian/patches/any/submitted-resolv-first-query-failure.diff
(rev 0)
+++
glibc-package/trunk/debian/patches/any/submitted-resolv-first-query-failure.diff
2012-02-02 00:14:08 UTC (rev 5147)
@@ -0,0 +1,36 @@
+2012-02-02 Aurelien Jarno <[email protected]>
+
+ * resolv/res_query.c(__libc_res_nsearch): succeed if the first
+ query fails, but the second query succeeds.
+
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 947c651..c88268f 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -378,7 +378,7 @@ __libc_res_nsearch(res_state statp,
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
+ answer, anslen, answerp,
+ answerp2, nanswerp2, resplen2);
+- if (ret > 0 || trailing_dot)
++ if (ret > 0 || (ret == 0 && *resplen2 > 0) || trailing_dot)
+ return (ret);
+ saved_herrno = h_errno;
+ tried_as_is++;
+@@ -418,7 +418,7 @@ __libc_res_nsearch(res_state statp,
+ answer, anslen, answerp,
+ answerp2, nanswerp2,
+ resplen2);
+- if (ret > 0)
++ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
+ return (ret);
+
+ if (answerp && *answerp != answer) {
+@@ -487,7 +487,7 @@ __libc_res_nsearch(res_state statp,
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
+ answer, anslen, answerp,
+ answerp2, nanswerp2, resplen2);
+- if (ret > 0)
++ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
+ return (ret);
+ }
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2012-02-01 22:04:02 UTC (rev
5146)
+++ glibc-package/trunk/debian/patches/series 2012-02-02 00:14:08 UTC (rev
5147)
@@ -320,3 +320,4 @@
any/cvs-vfscanf.diff
any/cvs-fmtmsg-lock.diff
any/cvs-reloc-sort.diff
+any/submitted-resolv-first-query-failure.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
