r4695 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2011-06-04 11:50:58 +0000 (Sat, 04 Jun 2011)
New Revision: 4695
Added:
glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add patches/any/cvs-getaddrinfo-single-lookup.diff to fix fallbackup to
single lookup dns requests.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-06-04 11:25:31 UTC (rev 4694)
+++ glibc-package/trunk/debian/changelog 2011-06-04 11:50:58 UTC (rev 4695)
@@ -28,6 +28,8 @@
* Add breaks on packages which don't support multiarch paths.
* Add patches/any/cvs-regex-oom.diff to fix an oom issue triggerable with
some regexes.
+ * Add patches/any/cvs-getaddrinfo-single-lookup.diff to fix fallbackup to
+ single lookup dns requests.
[ Steve Langasek ]
* Tighten the dependency on dpkg to a multiarch aware version.
Added: glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-single-lookup.diff 2011-06-04 11:50:58 UTC (rev 4695)
@@ -0,0 +1,29 @@
+2011-05-29 Ulrich Drepper <drepper@gmail.com>
+
+ [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)
+ {
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-06-04 11:25:31 UTC (rev 4694)
+++ glibc-package/trunk/debian/patches/series 2011-06-04 11:50:58 UTC (rev 4695)
@@ -261,3 +261,4 @@
any/submitted-rlimit-rttime.diff
any/local-tst-writev.diff
any/cvs-regex-oom.diff
+any/cvs-getaddrinfo-single-lookup.diff
Reply to: