Author: aurel32
Date: 2011-08-12 18:45:56 +0000 (Fri, 12 Aug 2011)
New Revision: 4874
Added:
glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
Modified:
glibc-package/branches/glibc-branch-squeeze/debian/changelog
glibc-package/branches/glibc-branch-squeeze/debian/patches/series
Log:
* Add patches/any/cvs-getaddrinfo-single-lookup.diff to fix fallback to
single lookup dns requests. Closes: #541167.
Modified: glibc-package/branches/glibc-branch-squeeze/debian/changelog
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/changelog
2011-08-12 18:41:27 UTC (rev 4873)
+++ glibc-package/branches/glibc-branch-squeeze/debian/changelog
2011-08-12 18:45:56 UTC (rev 4874)
@@ -38,6 +38,8 @@
* Add patches/any/cvs-resolv-different-nameserver.diff and
patches/any/submitted-resolv-assert.diff to try a different
nameserver if the first one returns REFUSED. Closes: #535504.
+ * Add patches/any/cvs-getaddrinfo-single-lookup.diff to fix fallback to
+ single lookup dns requests. Closes: #541167.
-- Aurelien Jarno <[email protected]> Sat, 11 Jun 2011 18:12:35 +0200
Added:
glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
===================================================================
---
glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
(rev 0)
+++
glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
2011-08-12 18:45:56 UTC (rev 4874)
@@ -0,0 +1,48 @@
+2011-06-27 Ulrich Drepper <[email protected]>
+
+ [BZ #12350]
+ * nscd/aicache.c (addhstaiX): Restore only RES_USE_INET6
+ bit from old_res_options.
+
+2011-05-29 Ulrich Drepper <[email protected]>
+
+ [BZ #12350]
+ * sysdeps/posix/getaddrinfo.c (gethosts): Restore only RES_USE_IENT6
+ bit from old_res_options.
+ (gaih_inet): Likewise.
+
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index 5ddda88..1e017b2 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -207,7 +207,7 @@ gaih_inet_serv (const char *servicename, const struct
gaih_typeproto *tp,
+ if (herrno == NETDB_INTERNAL) \
+ { \
+ __set_h_errno (herrno); \
+- _res.options = old_res_options; \
++ _res.options |= old_res_options & RES_USE_INET6; \
+ return -EAI_SYSTEM; \
+ } \
+ if (herrno == TRY_AGAIN)
\
+@@ -1015,7 +1015,7 @@ gaih_inet (const char *name, const struct gaih_service
*service,
+ nip = nip->next;
+ }
+
+- _res.options = old_res_options;
++ _res.options |= old_res_options & RES_USE_INET6;
+
+ if (no_data != 0 && no_inet6_data != 0)
+ {
+diff --git a/nscd/aicache.c b/nscd/aicache.c
+index 3190a13..6c8d83a 100644
+--- a/nscd/aicache.c
++++ b/nscd/aicache.c
+@@ -534,7 +534,7 @@ next_nip:
+ }
+
+ out:
+- _res.options = old_res_options;
++ _res.options |= old_res_options & RES_USE_INET6;
+
+ if (dataset != NULL && !alloca_used)
+ {
Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/series
2011-08-12 18:41:27 UTC (rev 4873)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/series
2011-08-12 18:45:56 UTC (rev 4874)
@@ -262,3 +262,4 @@
any/cvs-ignore-origin-privileged.diff
any/cvs-resolv-different-nameserver.diff
any/submitted-resolv-assert.diff
+any/cvs-getaddrinfo-single-lookup.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
