diff options
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/Config.in | 2 | ||||
| -rw-r--r-- | loginutils/addgroup.c | 4 | ||||
| -rw-r--r-- | loginutils/cryptpw.c | 2 | ||||
| -rw-r--r-- | loginutils/deluser.c | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/loginutils/Config.in b/loginutils/Config.in index 919091ec6..cab7a11a0 100644 --- a/loginutils/Config.in +++ b/loginutils/Config.in @@ -79,7 +79,7 @@ config FEATURE_DEL_USER_FROM_GROUP default n depends on DELGROUP help - If called with two non-option arguments, deluser + If called with two non-option arguments, deluser or delgroup will remove an user from a specified group. config ADDUSER diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c index 2487aad31..b29b66527 100644 --- a/loginutils/addgroup.c +++ b/loginutils/addgroup.c @@ -23,7 +23,7 @@ static void xgroup_study(struct group *g) goto error; } - /* Check if the desired gid is free or + /* Check if the desired gid is free or find the first free one */ do { if (g->gr_gid == max) { /* out of bounds: exit */ @@ -147,7 +147,7 @@ int addgroup_main(int argc, char **argv) #if ENABLE_FEATURE_ADDUSER_TO_GROUP if (argc == 2) { struct group *gr; - + /* check if group and user exist */ xuname2uid(argv[0]); /* unknown user: exit */ xgroup2gid(argv[1]); /* unknown group: exit */ diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 0c298c50d..dd7304613 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c @@ -1,7 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * cryptpw.c - * + * * Cooked from passwd.c by Thomas Lundquist <thomasez@zelow.no> */ diff --git a/loginutils/deluser.c b/loginutils/deluser.c index 59e69b9e9..0e4f02ddc 100644 --- a/loginutils/deluser.c +++ b/loginutils/deluser.c @@ -96,14 +96,14 @@ static void del_line_matching(char **args, int deluser_main(int argc, char **argv); int deluser_main(int argc, char **argv) { - if (argc == 2 - || (ENABLE_FEATURE_DEL_USER_FROM_GROUP + if (argc == 2 + || (ENABLE_FEATURE_DEL_USER_FROM_GROUP && (applet_name[3] == 'g' && argc == 3)) ) { if (geteuid()) bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); - - if ((ENABLE_FEATURE_DEL_USER_FROM_GROUP && argc != 3) + + if ((ENABLE_FEATURE_DEL_USER_FROM_GROUP && argc != 3) || ENABLE_DELUSER || (ENABLE_DELGROUP && ENABLE_DESKTOP) ) { |