about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-12-26 23:54:44 +0000
committerUlrich Drepper <drepper@redhat.com>2007-12-26 23:54:44 +0000
commit0dc6c5e4d63446706fe80d93f0c5d0a660183a36 (patch)
tree6436f2f9b127f732dfa589c5af2ce2ba5dfa8b36
parent80af8b826c87ce6e510012dff306d0b8ba2aec34 (diff)
downloadglibc-cvs/fedora-glibc-20071227T0908.tar.gz
glibc-cvs/fedora-glibc-20071227T0908.tar.xz
glibc-cvs/fedora-glibc-20071227T0908.zip
* nss/nsswitch.c (__nss_lookup): Actually use alternative name in cvs/fedora-glibc-20071227T0908
	second lookup.
-rw-r--r--ChangeLog5
-rw-r--r--nss/nsswitch.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 402b31bc83..619f629531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* nss/nsswitch.c (__nss_lookup): Actually use alternative name in
+	second lookup.
+
 2007-12-23  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/x86_64/cacheinfo.c (intel_02_known): New entry 0x3f.
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 28aa1b4f34..c0b661feb3 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -150,7 +150,7 @@ __nss_lookup (service_user **ni, const char *fct_name, const char *fct2_name,
 {
   *fctp = __nss_lookup_function (*ni, fct_name);
   if (*fctp == NULL && fct2_name != NULL)
-    *fctp = __nss_lookup_function (*ni, fct_name);
+    *fctp = __nss_lookup_function (*ni, fct2_name);
 
   while (*fctp == NULL
 	 && nss_next_action (*ni, NSS_STATUS_UNAVAIL) == NSS_ACTION_CONTINUE
@@ -160,7 +160,7 @@ __nss_lookup (service_user **ni, const char *fct_name, const char *fct2_name,
 
       *fctp = __nss_lookup_function (*ni, fct_name);
       if (*fctp == NULL && fct2_name != NULL)
-	*fctp = __nss_lookup_function (*ni, fct_name);
+	*fctp = __nss_lookup_function (*ni, fct2_name);
     }
 
   return *fctp != NULL ? 0 : (*ni)->next == NULL ? 1 : -1;