From 361b1a6884bc9d4f5cece22d0eb9fe5eae17bda7 Mon Sep 17 00:00:00 2001 From: Harald Becker Date: Wed, 22 Sep 2010 14:50:15 +0200 Subject: deluser: make it simpler, fix inability to delete user from group Also makes menuconfig order more sensible Signed-off-by: Harald Becker Signed-off-by: Denys Vlasenko --- loginutils/deluser.c | 54 +++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'loginutils/deluser.c') diff --git a/loginutils/deluser.c b/loginutils/deluser.c index e234d6678..65817b943 100644 --- a/loginutils/deluser.c +++ b/loginutils/deluser.c @@ -6,25 +6,18 @@ * Copyright (C) 1999,2000,2001 by John Beppu * Copyright (C) 2007 by Tito Ragusa * - * Licensed under GPLv2, see file LICENSE in this source tree. + * Licensed under GPL version 2, see file LICENSE in this tarball for details. * */ #include "libbb.h" -static int del_line_matching(char **args, const char *filename) -{ - if (ENABLE_FEATURE_DEL_USER_FROM_GROUP && args[2]) { - return update_passwd(filename, args[2], NULL, args[1]); - } - return update_passwd(filename, args[1], NULL, NULL); -} - int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int deluser_main(int argc, char **argv) { if (argc != 2 && (!ENABLE_FEATURE_DEL_USER_FROM_GROUP - || (applet_name[3] != 'g' || argc != 3)) + || applet_name[3] != 'g' + || argc != 3) ) { bb_show_usage(); } @@ -32,25 +25,30 @@ int deluser_main(int argc, char **argv) if (geteuid()) bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); - if ((ENABLE_FEATURE_DEL_USER_FROM_GROUP && argc != 3) - || ENABLE_DELUSER - || (ENABLE_DELGROUP && ENABLE_DESKTOP) - ) { - if (ENABLE_DELUSER - && (!ENABLE_DELGROUP || applet_name[3] == 'u') - ) { - if (del_line_matching(argv, bb_path_passwd_file) < 0) + if (ENABLE_DELUSER && applet_name[3] == 'u') { + /* deluser USER */ + if (update_passwd(bb_path_passwd_file, argv[1], NULL, NULL) < 0) + return EXIT_FAILURE; + if (ENABLE_FEATURE_SHADOWPASSWDS) + if (update_passwd(bb_path_shadow_file, argv[1], NULL, NULL) < 0) return EXIT_FAILURE; - if (ENABLE_FEATURE_SHADOWPASSWDS) { - del_line_matching(argv, bb_path_shadow_file); - } - } else if (ENABLE_DESKTOP && ENABLE_DELGROUP && getpwnam(argv[1])) - bb_error_msg_and_die("can't remove primary group of user %s", argv[1]); - } - if (del_line_matching(argv, bb_path_group_file) < 0) - return EXIT_FAILURE; - if (ENABLE_FEATURE_SHADOWPASSWDS) { - del_line_matching(argv, bb_path_gshadow_file); + } else if (ENABLE_DELGROUP) { + /* delgroup ... */ + if (!ENABLE_FEATURE_DEL_USER_FROM_GROUP || argc != 3) { + /* delgroup GROUP */ + if (update_passwd(bb_path_group_file, argv[1], NULL, NULL) < 0) + return EXIT_FAILURE; + if (ENABLE_FEATURE_SHADOWPASSWDS) + if (update_passwd(bb_path_gshadow_file, argv[1], NULL, NULL) < 0) + return EXIT_FAILURE; + } else { + /* delgroup USER GROUP */ + if (update_passwd(bb_path_group_file, argv[2], NULL, argv[1]) < 0) + return EXIT_FAILURE; + if (ENABLE_FEATURE_SHADOWPASSWDS) + if (update_passwd(bb_path_gshadow_file, argv[2], NULL, argv[1]) < 0) + return EXIT_FAILURE; + } } return EXIT_SUCCESS; } -- cgit v1.2.3