[Pkg-shadow-commits] r2222 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-07-27 02:33:37 +0000 (Sun, 27 Jul 2008)
New Revision: 2222

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/groupmems.c
Log:
	* NEWS, src/groupmems.c: Allow everybody to list the users of a group.
	This information is publicly available in /etc/group.
	* NEWS, src/groupmems.c: Open /etc/group read only for the -l option.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-07-27 02:11:32 UTC (rev 2221)
+++ upstream/trunk/ChangeLog	2008-07-27 02:33:37 UTC (rev 2222)
@@ -1,5 +1,11 @@
 2008-07-27  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* NEWS, src/groupmems.c: Allow everybody to list the users of a group.
+	This information is publicly available in /etc/group.
+	* NEWS, src/groupmems.c: Open /etc/group read only for the -l option.
+
+2008-07-27  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/groupmems.8.xml: Sort options alphabetically.
 
 2008-07-27  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2008-07-27 02:11:32 UTC (rev 2221)
+++ upstream/trunk/NEWS	2008-07-27 02:33:37 UTC (rev 2222)
@@ -13,6 +13,9 @@
 - groupmems
   * Check if user exist before they are added to groups.
   * Avoid segfault in case the specified group does not exist in /etc/group.
+  * Everybody is allowed to list the users of a group.
+  * /etc/group is open readonly when one just wants to list the users of a
+    group.
 
 shadow-4.1.2 -> shadow-4.1.2.1						26-06-2008
 

Modified: upstream/trunk/src/groupmems.c
===================================================================
--- upstream/trunk/src/groupmems.c	2008-07-27 02:11:32 UTC (rev 2221)
+++ upstream/trunk/src/groupmems.c	2008-07-27 02:33:37 UTC (rev 2222)
@@ -214,7 +214,7 @@
 	exit (code);
 }
 
-int main (int argc, char **argv) 
+void main (int argc, char **argv) 
 {
 	char *name;
 	struct group *grp;
@@ -232,27 +232,30 @@
 
 	if (NULL == thisgroup) {
 		name = whoami ();
-		if (NULL == name) {
+		if (!list && (NULL == name)) {
 			fprintf (stderr, _("%s: your groupname does not match your username\n"), Prog);
 			fail_exit (EXIT_NOT_PRIMARY);
 		}
 	} else {
 		name = thisgroup;
-		if (!isroot ()) {
+		if (!list && !isroot ()) {
 			fprintf (stderr, _("%s: only root can use the -g/--group option\n"), Prog);
 			fail_exit (EXIT_NOT_ROOT);
 		}
 	}
 
-	check_perms ();
+	if (!list) {
+		check_perms ();
 
-	if (!gr_lock ()) {
-		fprintf (stderr, _("%s: unable to lock group file\n"), Prog);
-		fail_exit (EXIT_GROUP_FILE);
+		if (!gr_lock ()) {
+			fprintf (stderr,
+			         _("%s: unable to lock group file\n"), Prog);
+			fail_exit (EXIT_GROUP_FILE);
+		}
+		group_locked = true;
 	}
-	group_locked = true;
 
-	if (!gr_open (O_RDWR)) {
+	if (!gr_open (list ? O_RDONLY : O_RDWR)) {
 		fprintf (stderr, _("%s: unable to open group file\n"), Prog);
 		fail_exit (EXIT_GROUP_FILE);
 	}
@@ -265,7 +268,9 @@
 		fail_exit (EXIT_INVALID_GROUP);
 	}
 
-	if (NULL != adduser) {
+	if (list) {
+		members (grp->gr_mem);
+	} else if (NULL != adduser) {
 		if (is_on_list (grp->gr_mem, adduser)) {
 			fprintf (stderr,
 			         _("%s: user `%s' is already a member of `%s'\n"),
@@ -286,8 +291,6 @@
 	} else if (purge) {
 		grp->gr_mem[0] = NULL;
 		gr_update (grp);
-	} else if (list) {
-		members (grp->gr_mem);
 	}
 
 	if (!gr_close ()) {
@@ -295,10 +298,6 @@
 		fail_exit (EXIT_GROUP_FILE);
 	}
 
-	if (gr_unlock () == 0) {
-		fprintf (stderr, _("%s: unable to unlock group file\n"), Prog);
-	}
-
-	exit (EXIT_SUCCESS);
+	fail_exit (EXIT_SUCCESS);
 }