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

fix usermod -rG x y while user y is not in group x will cause user y add into group x

Browse Source
This commit is contained in:
xyz 2022-08-26 19:23:13 -07:00 committed by Serge Hallyn
parent d324c6776b
commit e5db28a4bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/usermod.c
View File

@ -716,7 +716,7 @@ static void update_group (void)
* If rflg+Gflg is passed in AKA -rG invert is_member flag, which removes * If rflg+Gflg is passed in AKA -rG invert is_member flag, which removes
* mentioned groups while leaving the others. * mentioned groups while leaving the others.
*/ */
if (Gflg && rflg && was_member) { if (Gflg && rflg) {
is_member = !is_member; is_member = !is_member;
} }
@ -765,7 +765,7 @@ static void update_group (void)
"delete '%s' from group '%s'", "delete '%s' from group '%s'",
user_name, ngrp->gr_name)); user_name, ngrp->gr_name));
} }
} else { } else if (is_member) {
/* User was not a member but is now a member this /* User was not a member but is now a member this
* group. * group.
*/ */
@ -839,7 +839,7 @@ static void update_gshadow (void)
* If rflg+Gflg is passed in AKA -rG invert is_member, to remove targeted * If rflg+Gflg is passed in AKA -rG invert is_member, to remove targeted
* groups while leaving the user apart of groups not mentioned * groups while leaving the user apart of groups not mentioned
*/ */
if (Gflg && rflg && was_member) { if (Gflg && rflg) {
is_member = !is_member; is_member = !is_member;
} }