[commits] r13638 - in /fsf/trunk/libc: ChangeLog grp/initgroups.c nss/nsswitch.conf

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Apr 30 00:03:24 2011
New Revision: 13638

Log:
Import glibc-mainline for 2011-04-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/grp/initgroups.c
    fsf/trunk/libc/nss/nsswitch.conf

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Apr 30 00:03:24 2011
@@ -1,3 +1,9 @@
+2011-04-29  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* grp/initgroups.c (internal_getgrouplist): Prefer initgroups setting
+	to groups setting in database lookup.
+	* nss/nsswitch.conf: Add initgroups entry.
+
 2011-04-22  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	[BZ #12685]

Modified: fsf/trunk/libc/grp/initgroups.c
==============================================================================
--- fsf/trunk/libc/grp/initgroups.c (original)
+++ fsf/trunk/libc/grp/initgroups.c Sat Apr 30 00:03:24 2011
@@ -1,4 +1,5 @@
-/* Copyright (C) 1989,91,93,1996-2006,2008,2010 Free Software Foundation, Inc.
+/* Copyright (C) 1989,1991,1993,1996-2006,2008,2010,2011
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -85,7 +86,7 @@
       nip = __nss_group_database;
     }
   else
-    no_more = __nss_database_lookup ("group", NULL,
+    no_more = __nss_database_lookup ("initgroups", "group",
 				     "compat [NOTFOUND=return] files", &nip);
 
   while (! no_more)

Modified: fsf/trunk/libc/nss/nsswitch.conf
==============================================================================
--- fsf/trunk/libc/nss/nsswitch.conf (original)
+++ fsf/trunk/libc/nss/nsswitch.conf Sat Apr 30 00:03:24 2011
@@ -5,6 +5,7 @@
 
 passwd:		db files
 group:		db files
+initgroups:	db files
 shadow:		db files
 gshadow:	files