[commits] r4684 - in /fsf/trunk/libc: ChangeLog nss/nsswitch.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Dec 27 00:03:26 2007
New Revision: 4684

Log:
Import glibc-mainline for 2007-12-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nss/nsswitch.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Dec 27 00:03:26 2007
@@ -1,3 +1,8 @@
+2007-12-26  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* nss/nsswitch.c (__nss_lookup): Actually use alternative name in
+	second lookup.
+
 2007-12-23  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/x86_64/cacheinfo.c (intel_02_known): New entry 0x3f.

Modified: fsf/trunk/libc/nss/nsswitch.c
==============================================================================
--- fsf/trunk/libc/nss/nsswitch.c (original)
+++ fsf/trunk/libc/nss/nsswitch.c Thu Dec 27 00:03:26 2007
@@ -150,7 +150,7 @@
 {
   *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 @@
 
       *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;