From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sun, 27 Jul 2008 00:35:04 +0000 (+0000)
Subject: 	* src/groupmems.c: Remove isgroup(), which always returns TRUE.
X-Git-Tag: 4.1.3~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6c015e0d0921a07fa9fdce0cf5e75df9c29176f;p=thirdparty%2Fshadow.git

	* src/groupmems.c: Remove isgroup(), which always returns TRUE.
---

diff --git a/ChangeLog b/ChangeLog
index b0fcd392c..e42ed1f13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-27  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/groupmems.c: Remove isgroup(), which always returns TRUE.
+
 2008-07-27  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/groupmems.c: Reuse the functions from libmisc/list.c to deal
diff --git a/src/groupmems.c b/src/groupmems.c
index 2056312ff..e3922861d 100644
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -71,14 +71,6 @@ static char *Prog;
 
 #define isroot()		(getuid () == 0)
 
-static int isgroup (void)
-{
-	gid_t g = getgid ();
-	struct group *grp = getgrgid (g); /* local, no need for xgetgrgid */
-
-	return TRUE;
-}
-
 static char *whoami (void)
 {
 	/* local, no need for xgetgrgid */
@@ -189,9 +181,6 @@ int main (int argc, char **argv)
 		exit (EXIT_NOT_ROOT);
 	} else if (isroot () && NULL != thisgroup) {
 		name = thisgroup;
-	} else if (!isgroup ()) {
-		fputs (_("Group access is required\n"), stderr);
-		exit (EXIT_NOT_EROOT);
 	} else if (NULL == (name = whoami ())) {
 		fputs (_("Not primary owner of current group\n"), stderr);
 		exit (EXIT_NOT_PRIMARY);