r4758 - glibc-package/trunk/debian/patches/any
Author: aurel32
Date: 2011-06-28 15:58:48 +0000 (Tue, 28 Jun 2011)
New Revision: 4758
Modified:
glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
Log:
Update cvs-getaddrinfo-single-lookup.diff from upstream
Modified: glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff 2011-06-28 05:51:01 UTC (rev 4757)
+++ glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff 2011-06-28 15:58:48 UTC (rev 4758)
@@ -1,3 +1,9 @@
+2011-06-27 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12350]
+ * nscd/aicache.c (addhstaiX): Restore only RES_USE_INET6
+ bit from old_res_options.
+
2011-05-29 Ulrich Drepper <drepper@gmail.com>
[BZ #12350]
@@ -27,3 +33,16 @@
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)
+ {
Reply to: