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

Allow deleting the group even if it is the primary group of a user

Browse Source 
This is helpful when using configuration management tools such as
Puppet, where you are managing the groups in a central location and you
don't need this safeguard.

Signed-off-by: "Jesse W. Hathaway" <jesse@mbuki-mvuki.org>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Jesse W. Hathaway 2015-06-12 17:32:50 -05:00 committed by Serge Hallyn
parent ecb6f0c3e3
commit 3c32fd4a29
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/groupdel.c
View File

@ -60,6 +60,7 @@ const char *Prog;
static char *group_name; static char *group_name;
static gid_t group_id = -1; static gid_t group_id = -1;
static bool check_group_busy = true;
#ifdef SHADOWGRP #ifdef SHADOWGRP
static bool is_shadow_grp; static bool is_shadow_grp;
@ -96,6 +97,7 @@ static /*@noreturn@*/void usage (int status)
Prog); Prog);
(void) fputs (_(" -h, --help display this help message and exit\n"), usageout); (void) fputs (_(" -h, --help display this help message and exit\n"), usageout);
(void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
(void) fputs (_(" -f, --force delete group even if it is the primary group of a user\n"), usageout);
(void) fputs ("\n", usageout); (void) fputs ("\n", usageout);
exit (status); exit (status);
} }
@ -321,7 +323,7 @@ static void process_flags (int argc, char **argv)
{NULL, 0, NULL, '\0'} {NULL, 0, NULL, '\0'}
}; };
while ((c = getopt_long (argc, argv, "hR:", while ((c = getopt_long (argc, argv, "hfR:",
long_options, NULL)) != -1) { long_options, NULL)) != -1) {
switch (c) { switch (c) {
case 'h': case 'h':
@ -329,6 +331,9 @@ static void process_flags (int argc, char **argv)
/*@notreached@*/break; /*@notreached@*/break;
case 'R': /* no-op, handled in process_root_flag () */ case 'R': /* no-op, handled in process_root_flag () */
break; break;
case 'f':
check_group_busy = false;
break;
default: default:
usage (E_USAGE); usage (E_USAGE);
} }
@ -465,7 +470,9 @@ int main (int argc, char **argv)
/* /*
* Make sure this isn't the primary group of anyone. * Make sure this isn't the primary group of anyone.
*/ */
group_busy (group_id); if (check_group_busy) {
group_busy (group_id);
}
/* /*
* Do the hard stuff - open the files, delete the group entries, * Do the hard stuff - open the files, delete the group entries,