Author: aurel32
Date: 2009-07-25 19:43:09 +0000 (Sat, 25 Jul 2009)
New Revision: 3655
Added:
glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-nss-notfound.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nss-notfound.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Replace submitted-getaddrinfo-nss-notfound.diff by upstream version.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-07-25 19:36:55 UTC (rev
3654)
+++ glibc-package/trunk/debian/changelog 2009-07-25 19:43:09 UTC (rev
3655)
@@ -11,8 +11,8 @@
* debhelper.in/libc-alt.preinst: also clear old /lib32 and /usr/lib32
symlinks on install, as they might have been left by a previous
installation of the package.
- * patches/any/submitted-getaddrinfo-nss-notfound.diff: new patch to
- correctly handle missing NSS modules. Closes: #535106.
+ * patches/any/cvs-getaddrinfo-nss-notfound.diff: new patch to correctly
+ handle missing NSS modules. Closes: #535106.
-- Aurelien Jarno <[email protected]> Mon, 20 Jul 2009 20:33:36 +0200
Added: glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-nss-notfound.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-nss-notfound.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-getaddrinfo-nss-notfound.diff
2009-07-25 19:43:09 UTC (rev 3655)
@@ -0,0 +1,36 @@
+commit 657317537c09b82a2feb1194fda045f63e3a1222
+Author: Ulrich Drepper <[email protected]>
+Date: Sat Jul 25 12:29:04 2009 -0700
+
+ Handle missing NSS modules and those without callbacks.
+
+ getaddrinfo didn't update the status variable in that round of the
+ loop if no callback was used.
+
+diff --git a/ChangeLog b/ChangeLog
+index 8246614..f47b089 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,9 @@
+ 2009-07-25 Ulrich Drepper <[email protected]>
+
++ [BZ #10448]
++ * sysdeps/posix/getaddrinfo.c (gaih_inet): If NSS module contains no
++ callback we must touch the status to avoid using stale value.
++
+ * sysdeps/x86_64/multiarch/strcmp.S: Exclude unused code from being
+ compiled in.
+
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index d346c62..a788d18 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -833,6 +833,8 @@ gaih_inet (const char *name, const struct gaih_service
*service,
+ && inet6_status != NSS_STATUS_UNAVAIL)
+ status = inet6_status;
+ }
++ else
++ status = NSS_STATUS_UNAVAIL;
+ }
+
+ if (nss_next_action (nip, status) == NSS_ACTION_RETURN)
Deleted:
glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nss-notfound.diff
===================================================================
---
glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nss-notfound.diff
2009-07-25 19:36:55 UTC (rev 3654)
+++
glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nss-notfound.diff
2009-07-25 19:43:09 UTC (rev 3655)
@@ -1,18 +0,0 @@
-2009-07-25 Aurelien Jarno <[email protected]>
-
- * sysdeps/posix/getaddrinfo.c(gaih_inet): set the status to
- NSS_STATUS_UNAVAIL if __nss_lookup_function() fails.
-
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index d346c62..d8016f7 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -833,6 +833,8 @@ gaih_inet (const char *name, const struct gaih_service
*service,
- && inet6_status != NSS_STATUS_UNAVAIL)
- status = inet6_status;
- }
-+ else
-+ status = NSS_STATUS_UNAVAIL;
- }
-
- if (nss_next_action (nip, status) == NSS_ACTION_RETURN)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-07-25 19:36:55 UTC (rev
3654)
+++ glibc-package/trunk/debian/patches/series 2009-07-25 19:43:09 UTC (rev
3655)
@@ -214,4 +214,4 @@
any/cvs-sunrpc-license.diff
any/submitted-tst-cpucount.diff
any/submitted-signalfd-eventfd.diff
-any/submitted-getaddrinfo-nss-notfound.diff
+any/cvs-getaddrinfo-nss-notfound.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
