summary refs log tree commit diff
path: root/grp
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-15 20:53:22 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-15 21:06:19 -0400
commitc41af17eed77f07983dab6f702a6347fcad9a619 (patch)
tree1d6ec2a294dcca7d9f54e26231b89752d6d44cd2 /grp
parenta9e836b0406c259979fbb31eb6650d33c2bbefbc (diff)
downloadglibc-c41af17eed77f07983dab6f702a6347fcad9a619.tar.gz
glibc-c41af17eed77f07983dab6f702a6347fcad9a619.tar.xz
glibc-c41af17eed77f07983dab6f702a6347fcad9a619.zip
Fix handling of initgroups database.
Diffstat (limited to 'grp')
-rw-r--r--grp/initgroups.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/grp/initgroups.c b/grp/initgroups.c
index dad30d5aa4..48119ff7f2 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -44,7 +44,7 @@ extern int __nss_group_lookup (service_user **nip, const char *name,
 extern void *__nss_lookup_function (service_user *ni, const char *fct_name);
 
 extern service_user *__nss_group_database attribute_hidden;
-static service_user *initgroups_database;
+service_user *__nss_initgroups_database;
 static bool use_initgroups_entry;
 
 
@@ -80,26 +80,31 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
   /* Start is one, because we have the first group as parameter.  */
   long int start = 1;
 
-  if (initgroups_database == NULL)
+  if (__nss_initgroups_database == NULL)
     {
       no_more = __nss_database_lookup ("initgroups", NULL, "",
-				       &initgroups_database);
-      if (no_more == 0 && initgroups_database == NULL)
+				       &__nss_initgroups_database);
+      if (no_more == 0 && __nss_initgroups_database == NULL)
 	{
 	  if (__nss_group_database == NULL)
 	    no_more = __nss_database_lookup ("group", NULL, "compat files",
 					     &__nss_group_database);
 
-	  initgroups_database = __nss_group_database;
+	  __nss_initgroups_database = __nss_group_database;
 	}
-      else if (initgroups_database != NULL)
+      else if (__nss_initgroups_database != NULL)
 	{
 	  assert (no_more == 0);
 	  use_initgroups_entry = true;
 	}
     }
+  else
+    /* __nss_initgroups_database might have been set through
+       __nss_configure_lookup in which case use_initgroups_entry was
+       not set here.  */
+    use_initgroups_entry = __nss_initgroups_database != __nss_group_database;
 
-  service_user *nip = initgroups_database;
+  service_user *nip = __nss_initgroups_database;
   while (! no_more)
     {
       long int prev_start = start;