VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src/gpasswd.c: Move if out of cpp conditional

Browse Source 
This simplifies the code a little bit, and prepares for the next
commits, which will clean up further.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2023-09-02 16:14:03 +02:00
committed by Iker Pedrosa
parent 1fcf807949
commit ccc055d9d9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gpasswd.c
View File

@@ -710,7 +710,7 @@ static void check_perms (const struct group *gr)
}
} else
#endif /* SHADOWGRP */
{
if (!amroot) {
#ifdef FIRST_MEMBER_IS_ADMIN
/*
* The policy here for changing a group is that
@@ -726,19 +726,13 @@ static void check_perms (const struct group *gr)
* first group member might be just a normal user.
* --marekm
*/
if (!amroot) {
if (gr->gr_mem[0] == NULL) {
failure ();
}
if (gr->gr_mem[0] == NULL)
failure();
if (strcmp (gr->gr_mem[0], myname) != 0) {
failure ();
}
}
if (strcmp(gr->gr_mem[0], myname) != 0)
failure();
#else /* ! FIRST_MEMBER_IS_ADMIN */
if (!amroot) {
failure ();
}
failure();
#endif
}
}