summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2009-08-17 15:48:46 +0200
committerAndreas Schwab <schwab@redhat.com>2009-08-17 15:48:46 +0200
commitf6f6447978923a9324f727c7b44a39bff3b06dbc (patch)
tree2dd2c94f79df27e54719d4311b823afacfcbeb6e
parentc8647a518bd942c7ca5ef2a7e6618efc39db6d33 (diff)
parentaa152ec6ad1bcc84a53f3c02810c7d968d1b8216 (diff)
Merge commit 'origin/release/2.10/master' into fedora/2.10/master
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/posix/getaddrinfo.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e5a5e5188c..57140d6aa3 100644
--- 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
index d346c621fb..a788d18fee 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)