Author: aurel32
Date: 2014-05-04 21:39:26 +0000 (Sun, 04 May 2014)
New Revision: 6039
Added:
glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff
Removed:
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: replace by upstream
version patches/any/cvs-resolv-first-query-failure.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-05-04 20:39:24 UTC (rev
6038)
+++ glibc-package/trunk/debian/changelog 2014-05-04 21:39:26 UTC (rev
6039)
@@ -15,6 +15,8 @@
#689427.
* patches/any/cvs-wprintf.diff: patch from upstream to correctly handle
%p in wprintf(). Closes: #729514.
+ * patches/any/submitted-resolv-first-query-failure.diff: replace by upstream
+ version patches/any/cvs-resolv-first-query-failure.diff.
-- Adam Conrad <[email protected]> Sun, 27 Apr 2014 23:15:13 -0600
Added:
glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff
2014-05-04 21:39:26 UTC (rev 6039)
@@ -0,0 +1,54 @@
+2014-04-30 Siddhesh Poyarekar <[email protected]>
+ Atsushi Onoe <[email protected]>
+
+ [BZ #14308]
+ [BZ #12994]
+ [BZ #13651]
+ * resolv/res_query.c (__libc_res_nsearch): Return if at least
+ one response is valid.
+ * resolv/res_send.c (send_dg): Check for validity of other
+ response if the current response is a referral.
+
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -382,7 +382,9 @@ __libc_res_nsearch(res_state statp,
+ answer, anslen, answerp,
+ answerp2, nanswerp2, resplen2,
+ answerp2_malloced);
+- if (ret > 0 || trailing_dot)
++ if (ret > 0 || trailing_dot
++ /* If the second response is valid then we use that. */
++ || (ret == 0 && answerp2 != NULL && resplen2 > 0))
+ return (ret);
+ saved_herrno = h_errno;
+ tried_as_is++;
+@@ -422,7 +424,8 @@ __libc_res_nsearch(res_state statp,
+ answer, anslen, answerp,
+ answerp2, nanswerp2,
+ resplen2,
answerp2_malloced);
+- if (ret > 0)
++ if (ret > 0 || (ret == 0 && answerp2 != NULL
++ && resplen2 > 0))
+ return (ret);
+
+ if (answerp && *answerp != answer) {
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -1351,6 +1351,7 @@ send_dg(res_state statp,
+ (*thisresplenp > *thisanssizp)
+ ? *thisanssizp : *thisresplenp);
+
++ next_ns:
+ if (recvresp1 || (buf2 != NULL && recvresp2)) {
+ *resplen2 = 0;
+ return resplen;
+@@ -1368,7 +1369,6 @@ send_dg(res_state statp,
+ goto wait;
+ }
+
+- next_ns:
+ __res_iclose(statp, false);
+ /* don't retry if called from dig */
+ if (!statp->pfcode)
Deleted:
glibc-package/trunk/debian/patches/any/submitted-resolv-first-query-failure.diff
===================================================================
---
glibc-package/trunk/debian/patches/any/submitted-resolv-first-query-failure.diff
2014-05-04 20:39:24 UTC (rev 6038)
+++
glibc-package/trunk/debian/patches/any/submitted-resolv-first-query-failure.diff
2014-05-04 21:39:26 UTC (rev 6039)
@@ -1,38 +0,0 @@
-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.
-
----
- resolv/res_query.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -378,7 +378,7 @@
- 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 @@
- 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 @@
- 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 2014-05-04 20:39:24 UTC (rev
6038)
+++ glibc-package/trunk/debian/patches/series 2014-05-04 21:39:26 UTC (rev
6039)
@@ -246,7 +246,6 @@
any/local-ldconfig-multiarch.diff
any/local-tst-writev.diff
any/submitted-resolv-init.diff
-any/submitted-resolv-first-query-failure.diff
any/local-disable-libnss-db.diff
any/local-revert-bz13979.diff
any/local-tst-eintr1-eagain.diff
@@ -276,3 +275,4 @@
any/local-no-malloc-backtrace.diff
any/cvs-make-4.0.diff
any/cvs-wprintf.diff
+any/cvs-resolv-first-query-failure.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]
