Merge commit 'origin/release/2.10/master' into fedora/2.10/master

git-mirror · Aug 17, 2009 · f6f6447 · f6f6447
2 parents c8647a5 + aa152ec
commit f6f6447
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-25  Ulrich Drepper  <drepper@redhat.com>
+
+	[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@redhat.com>
 
 	* login/Makefile: Build pt_chown as PIE.

diff --git 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)