emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #74 from AdamMajer/upstream

Browse Source 
support dynamically added users via pam_group
This commit is contained in:
Serge Hallyn 2017-06-15 22:41:25 -05:00 committed by GitHub
commit 7081b2df85
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/newgrp.c
View File

@ -387,6 +387,7 @@ int main (int argc, char **argv)
{ {
bool initflag = false; bool initflag = false;
int i; int i;
bool is_member = false;
bool cflag = false; bool cflag = false;
int err = 0; int err = 0;
gid_t gid; gid_t gid;
@ -625,6 +626,18 @@ int main (int argc, char **argv)
goto failure; goto failure;
} }
#ifdef HAVE_SETGROUPS
/* when using pam_group, she will not be listed in the groups
* database. However getgroups() will return the group. So
* if she is listed there already it is ok to grant membership.
*/
for (i = 0; i < ngroups; i++) {
if (grp->gr_gid == grouplist[i]) {
is_member = true;
break;
}
}
#endif /* HAVE_SETGROUPS */
/* /*
* For splitted groups (due to limitations of NIS), check all * For splitted groups (due to limitations of NIS), check all
* groups of the same GID like the requested group for * groups of the same GID like the requested group for
@ -653,7 +666,9 @@ int main (int argc, char **argv)
/* /*
* Check if the user is allowed to access this group. * Check if the user is allowed to access this group.
*/ */
check_perms (grp, pwd, group); if (!is_member) {
check_perms (grp, pwd, group);
}
/* /*
* all successful validations pass through this point. The group id * all successful validations pass through this point. The group id