r3697 - in glibc-package/trunk/debian: . patches/any
Author: aurel32
Date: 2009-07-26 21:58:01 +0000 (Sun, 26 Jul 2009)
New Revision: 3697
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff
Log:
* Update any/cvs-broken-dns.diff from upstream.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-07-26 21:51:12 UTC (rev 3696)
+++ glibc-package/trunk/debian/changelog 2009-07-26 21:58:01 UTC (rev 3697)
@@ -14,8 +14,9 @@
* Move all upstream changelogs in glibc-docs, and install a small
changelog file explaining the reason.
* Ship README.libm in libc6-dev.
+ * Update any/cvs-broken-dns.diff from upstream.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 26 Jul 2009 19:17:08 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 26 Jul 2009 23:57:25 +0200
eglibc (2.9-22) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff 2009-07-26 21:51:12 UTC (rev 3696)
+++ glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff 2009-07-26 21:58:01 UTC (rev 3697)
@@ -1,3 +1,9 @@
+2009-07-26 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10452]
+ * resolv/res_send.c (send_dg): Pass full SERVFAIL, NOTIMP, REFUSED
+ replies up.
+
2009-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/resolv.h: Define RES_SNGLKUPREOP.
@@ -49,10 +55,10 @@
---
resolv/res_init.c | 6 ++
resolv/res_query.c | 7 +++
- resolv/res_send.c | 90 ++++++++++++++++++++++++++++++++++----------
+ resolv/res_send.c | 96 +++++++++++++++++++++++++++++++++-----------
resolv/resolv.h | 3 +
sysdeps/posix/getaddrinfo.c | 4 +
- 5 files changed, 91 insertions(+), 19 deletions(-)
+ 5 files changed, 92 insertions(+), 24 deletions(-)
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -178,7 +184,23 @@
pfd[0].events = POLLIN;
else
pfd[0].events = POLLIN | POLLOUT;
-@@ -1250,8 +1292,18 @@
+@@ -1200,14 +1242,10 @@
+ ? *thisanssiz : *thisresplen);
+
+ if (recvresp1 || (buf2 != NULL && recvresp2))
+- {
+- *resplen2 = 1;
+- return resplen;
+- }
++ return resplen;
+ if (buf2 != NULL)
+ {
+ /* We are waiting for a possible second reply. */
+- resplen = 1;
+ if (hp->id == anhp->id)
+ recvresp1 = 1;
+ else
+@@ -1250,8 +1288,18 @@
else
recvresp2 = 1;
/* Repeat waiting if we have a second answer to arrive. */
Reply to: