about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-15 20:54:31 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-15 21:06:19 -0400
commit82e9a1f7df488c62a214ee63847b2c884dcba565 (patch)
tree271719d21cef70e74fc8c0f1e34f13f8790c689c
parentc41af17eed77f07983dab6f702a6347fcad9a619 (diff)
downloadglibc-82e9a1f7df488c62a214ee63847b2c884dcba565.tar.gz
glibc-82e9a1f7df488c62a214ee63847b2c884dcba565.tar.xz
glibc-82e9a1f7df488c62a214ee63847b2c884dcba565.zip
Add initgroups lookup support to getent
-rw-r--r--ChangeLog3
-rw-r--r--nss/getent.c33
2 files changed, 36 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f74127808e..49d85da5db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-15  Ulrich Drepper  <drepper@gmail.com>
 
+	* nss/getent.c: Add support for initgroups lookups through getgrouplist
+	interface.
+
 	* grp/initgroups.c (__nss_initgroups_database): Renamed and exported.
 	(internal_getgrouplist): Adjust to name change.
 	Update use_initgroups_entry if this is not the first call.
diff --git a/nss/getent.c b/nss/getent.c
index a33bcb4ac1..9d43e2f656 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -501,6 +501,38 @@ netgroup_keys (int number, char *key[])
   return result;
 }
 
+/* This is for initgroups */
+static int
+initgroups_keys (int number, char *key[])
+{
+  int ngrps = 100;
+  size_t grpslen = ngrps * sizeof (gid_t);
+  gid_t *grps = alloca (grpslen);
+
+  for (int i = 0; i < number; ++i)
+    {
+      int no = ngrps;
+      int n;
+      while ((n = getgrouplist (key[i], -1, grps, &no)) == -1
+	     && no > ngrps)
+	{
+	  grps = extend_alloca (grps, grpslen, no * sizeof (gid_t));
+	  ngrps = no;
+	}
+
+      if (n == -1)
+	return 1;
+
+      printf ("%-21s", key[i]);
+      for (int j = 0; j < n; ++j)
+	if (grps[j] != -1)
+	  printf (" %ld", (long int) grps[j]);
+      putchar_unlocked ('\n');
+    }
+
+  return 0;
+}
+
 /* This is for networks */
 static void
 print_networks (struct netent *net)
@@ -829,6 +861,7 @@ D(ethers)
 D(group)
 D(gshadow)
 D(hosts)
+D(initgroups)
 D(netgroup)
 D(networks)
 D(passwd)