r5155 - in glibc-package/branches/glibc-branch-squeeze/debian: . patches patches/any
Author: aurel32
Date: 2012-02-02 21:19:04 +0000 (Thu, 02 Feb 2012)
New Revision: 5155
Added:
glibc-package/branches/glibc-branch-squeeze/debian/patches/any/submitted-resolv-first-query-failure.diff
Modified:
glibc-package/branches/glibc-branch-squeeze/debian/changelog
glibc-package/branches/glibc-branch-squeeze/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/branches/glibc-branch-squeeze/debian/changelog
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/changelog 2012-02-02 21:18:51 UTC (rev 5154)
+++ glibc-package/branches/glibc-branch-squeeze/debian/changelog 2012-02-02 21:19:04 UTC (rev 5155)
@@ -2,6 +2,9 @@
* patches/any/cvs-tzfile.diff: fix integer overflow in timezone code.
(CVE-2009-5029). Closes: #650790.
+ * 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 <aurel32@debian.org> Sun, 18 Dec 2011 17:33:40 +0100
Added: glibc-package/branches/glibc-branch-squeeze/debian/patches/any/submitted-resolv-first-query-failure.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/any/submitted-resolv-first-query-failure.diff (rev 0)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/any/submitted-resolv-first-query-failure.diff 2012-02-02 21:19:04 UTC (rev 5155)
@@ -0,0 +1,36 @@
+2012-02-02 Aurelien Jarno <aurel32@debian.org>
+
+ * 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/branches/glibc-branch-squeeze/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/series 2012-02-02 21:18:51 UTC (rev 5154)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/series 2012-02-02 21:19:04 UTC (rev 5155)
@@ -271,3 +271,4 @@
any/cvs-nptl-pthread-race.diff
any/cvs-statvfs-mount-flags.diff
any/cvs-tzfile.diff
+any/submitted-resolv-first-query-failure.diff
Reply to: