|
 |
827aa9 |
diff -up shadow-4.1.5.1/src/newgrp.c.ingroup shadow-4.1.5.1/src/newgrp.c
|
|
|
827aa9 |
--- shadow-4.1.5.1/src/newgrp.c.ingroup 2014-08-29 13:31:38.000000000 +0200
|
|
|
827aa9 |
+++ shadow-4.1.5.1/src/newgrp.c 2014-08-29 14:04:57.183849650 +0200
|
|
|
827aa9 |
@@ -83,15 +83,29 @@ static void usage (void)
|
|
|
827aa9 |
}
|
|
|
827aa9 |
}
|
|
|
827aa9 |
|
|
|
827aa9 |
+static bool ingroup(const char *name, struct group *gr)
|
|
|
827aa9 |
+{
|
|
|
827aa9 |
+ char **look;
|
|
|
827aa9 |
+ bool notfound = true;
|
|
|
827aa9 |
+
|
|
|
827aa9 |
+ look = gr->gr_mem;
|
|
|
827aa9 |
+ while (*look && notfound)
|
|
|
827aa9 |
+ notfound = strcmp (*look++, name);
|
|
|
827aa9 |
+
|
|
|
827aa9 |
+ return !notfound;
|
|
|
827aa9 |
+}
|
|
|
827aa9 |
+
|
|
|
827aa9 |
/*
|
|
|
827aa9 |
- * find_matching_group - search all groups of a given group id for
|
|
|
827aa9 |
+ * find_matching_group - search all groups of a gr's group id for
|
|
|
827aa9 |
* membership of a given username
|
|
|
827aa9 |
+ * but check gr itself first
|
|
|
827aa9 |
*/
|
|
|
827aa9 |
-static /*@null@*/struct group *find_matching_group (const char *name, gid_t gid)
|
|
|
827aa9 |
+static /*@null@*/struct group *find_matching_group (const char *name, struct group *gr)
|
|
|
827aa9 |
{
|
|
|
827aa9 |
- struct group *gr;
|
|
|
827aa9 |
- char **look;
|
|
|
827aa9 |
- bool notfound = true;
|
|
|
827aa9 |
+ gid_t gid = gr->gr_gid;
|
|
|
827aa9 |
+
|
|
|
827aa9 |
+ if (ingroup(name, gr))
|
|
|
827aa9 |
+ return gr;
|
|
|
827aa9 |
|
|
|
827aa9 |
setgrent ();
|
|
|
827aa9 |
while ((gr = getgrent ()) != NULL) {
|
|
|
827aa9 |
@@ -103,14 +117,8 @@ static /*@null@*/struct group *find_matc
|
|
|
827aa9 |
* A group with matching GID was found.
|
|
|
827aa9 |
* Test for membership of 'name'.
|
|
|
827aa9 |
*/
|
|
|
827aa9 |
- look = gr->gr_mem;
|
|
|
827aa9 |
- while ((NULL != *look) && notfound) {
|
|
|
827aa9 |
- notfound = (strcmp (*look, name) != 0);
|
|
|
827aa9 |
- look++;
|
|
|
827aa9 |
- }
|
|
|
827aa9 |
- if (!notfound) {
|
|
|
827aa9 |
+ if (ingroup(name, gr))
|
|
|
827aa9 |
break;
|
|
|
827aa9 |
- }
|
|
|
827aa9 |
}
|
|
|
827aa9 |
endgrent ();
|
|
|
827aa9 |
return gr;
|
|
|
827aa9 |
@@ -616,7 +624,7 @@ int main (int argc, char **argv)
|
|
|
827aa9 |
* groups of the same GID like the requested group for
|
|
|
827aa9 |
* membership of the current user.
|
|
|
827aa9 |
*/
|
|
|
827aa9 |
- grp = find_matching_group (name, grp->gr_gid);
|
|
|
827aa9 |
+ grp = find_matching_group (name, grp);
|
|
|
827aa9 |
if (NULL == grp) {
|
|
|
827aa9 |
/*
|
|
|
827aa9 |
* No matching group found. As we already know that
|