r3553 - in glibc-package/trunk/debian: . patches/any
Author: aurel32
Date: 2009-06-13 20:19:04 +0000 (Sat, 13 Jun 2009)
New Revision: 3553
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff
Log:
* any/cvs-broken-dns.diff: backport more parts from upstream.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-06-13 19:36:32 UTC (rev 3552)
+++ glibc-package/trunk/debian/changelog 2009-06-13 20:19:04 UTC (rev 3553)
@@ -2,6 +2,7 @@
* kfreebsd/local-sysdeps.diff: update to revision 2597 (from glibc-bsd).
Update expected testsuite results accordingly.
+ * any/cvs-broken-dns.diff: backport more parts from upstream.
-- Aurelien Jarno <aurel32@debian.org> Sat, 13 Jun 2009 21:33:04 +0200
Modified: glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff 2009-06-13 19:36:32 UTC (rev 3552)
+++ glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff 2009-06-13 20:19:04 UTC (rev 3553)
@@ -1,3 +1,8 @@
+2009-06-11 Ulrich Drepper <drepper@redhat.com>
+
+ * resolv/res_send.c (send_dg): Remember we switched to
+ single-request mode.
+
2009-04-16 Ulrich Drepper <drepper@redhat.com>
* resolv/res_send.c (send_dg): Don't just ignore the result we got
@@ -47,7 +52,7 @@
seconds /= statp->nscount;
if (seconds <= 0)
seconds = 1;
-+ bool single_request = ((statp->options) & RES_SNGLKUP) != 0;// XXX
++ bool single_request = (statp->options & RES_SNGLKUP) != 0;// XXX
+ int save_gotsomewhere = *gotsomewhere;
+ retry:
evNowTime(&now);
@@ -74,6 +79,7 @@
+ have received the first answer. */
+ if (!single_request)
+ {
++ statp->options |= RES_SNGLKUP;
+ single_request = true;
+ *gotsomewhere = save_gotsomewhere;
+ goto retry;
Reply to: