[commits] r8873 - in /branches/eglibc-2_10/libc: ChangeLog sysdeps/posix/getaddrinfo.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Aug 25 08:17:48 2009
New Revision: 8873

Log:
Merge changes between r8790 and r8872 from /fsf/glibc-2_10-branch.

Modified:
    branches/eglibc-2_10/libc/ChangeLog
    branches/eglibc-2_10/libc/sysdeps/posix/getaddrinfo.c

Modified: branches/eglibc-2_10/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_10/libc/ChangeLog (original)
+++ branches/eglibc-2_10/libc/ChangeLog Tue Aug 25 08:17:48 2009
@@ -1,3 +1,9 @@
+2009-07-25  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #10448]
+	* sysdeps/posix/getaddrinfo.c (gaih_inet): If NSS module contains no
+	callback we must touch the status to avoid using stale value.
+
 2009-06-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* login/Makefile: Build pt_chown as PIE.

Modified: branches/eglibc-2_10/libc/sysdeps/posix/getaddrinfo.c
==============================================================================
--- branches/eglibc-2_10/libc/sysdeps/posix/getaddrinfo.c (original)
+++ branches/eglibc-2_10/libc/sysdeps/posix/getaddrinfo.c Tue Aug 25 08:17:48 2009
@@ -833,6 +833,8 @@
 			       && inet6_status != NSS_STATUS_UNAVAIL)
 			status = inet6_status;
 		    }
+		  else
+		    status = NSS_STATUS_UNAVAIL;
 		}
 
 	      if (nss_next_action (nip, status) == NSS_ACTION_RETURN)