Author: aurel32
Date: 2009-05-04 22:50:43 +0000 (Mon, 04 May 2009)
New Revision: 3447
Added:
glibc-package/trunk/debian/patches/any/submitted-broken-dns.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* any/submitted-broken-dns.diff: new patch to not raise an error if one
query returns NOTIMP or FORMERR and the other NOERROR.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-05-04 22:38:08 UTC (rev
3446)
+++ glibc-package/trunk/debian/changelog 2009-05-04 22:50:43 UTC (rev
3447)
@@ -9,6 +9,8 @@
[ Aurelien Jarno ]
* any/cvs-broken-dns.diff: backport more parts from upstream.
+ * any/submitted-broken-dns.diff: new patch to not raise an error if one
+ query returns NOTIMP or FORMERR and the other NOERROR.
-- Aurelien Jarno <aure...@debian.org> Tue, 28 Apr 2009 23:11:30 +0200
Added: glibc-package/trunk/debian/patches/any/submitted-broken-dns.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-broken-dns.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-broken-dns.diff
2009-05-04 22:50:43 UTC (rev 3447)
@@ -0,0 +1,18 @@
+2009-05-05 Aurelien Jarno <aurel...@aurel32.net>
+
+ * resolv/res_query.c (__libc_res_nquery): If one query returns NOTIMP
+ or FORMERR and the other NOERROR, don't raise an error.
+
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -289,6 +289,10 @@ __libc_res_nquery(res_state statp,
+ break;
+ case FORMERR:
+ case NOTIMP:
++ if ((hp->rcode == NOERROR && ntohs (hp->ancount) != 0)
++ || (hp2->rcode == NOERROR
++ && ntohs (hp2->ancount) != 0))
++ goto success;
+ case REFUSED:
+ default:
+ RES_SET_H_ERRNO(statp, NO_RECOVERY);
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-05-04 22:38:08 UTC (rev
3446)
+++ glibc-package/trunk/debian/patches/series 2009-05-04 22:50:43 UTC (rev
3447)
@@ -203,3 +203,4 @@
any/local-getaddrinfo-interface.diff
any/cvs-broken-dns.diff
any/cvs-binutils_2.20.diff
+any/submitted-broken-dns.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
