Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/loginutils/deluser.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/loginutils/deluser.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/loginutils/deluser.c

@@ -7 +7 @@
  * Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  *
  */
-
 #include "libbb.h"
 
-/* Status */
-#define STATUS_OK            0
-#define NAME_NOT_FOUND       1
-#define MEMBER_NOT_FOUND     2
+int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int deluser_main(int argc, char **argv)
+{
+    /* User or group name */
+    char *name;
+    /* Username (non-NULL only in "delgroup USER GROUP" case) */
+    char *member;
+    /* Name of passwd or group file */
+    const char *pfile;
+    /* Name of shadow or gshadow file */
+    const char *sfile;
+    /* Are we deluser or delgroup? */
+    int do_deluser = (ENABLE_DELUSER && (!ENABLE_DELGROUP || applet_name[3] == 'u'));
 
-static void del_line_matching(char **args,
-        const char *filename,
-        FILE *(*fopen_func)(const char *fileName, const char *mode))
-{
-    FILE *passwd;
-    smallint error = NAME_NOT_FOUND;
-    char *name = (ENABLE_FEATURE_DEL_USER_FROM_GROUP && args[2]) ? args[2] : args[1];
-    char *line, *del;
-    char *new = xzalloc(1);
+    if (geteuid() != 0)
+        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
-    passwd = fopen_func(filename, "r");
-    if (passwd) {
-        while ((line = xmalloc_fgets(passwd))) {
-            int len = strlen(name);
+    name = argv[1];
+    member = NULL;
 
-            if (strncmp(line, name, len) == 0
-             && line[len] == ':'
-            ) {
-                error = STATUS_OK;
-                if (ENABLE_FEATURE_DEL_USER_FROM_GROUP) {
-                    struct group *gr;
-                    char *p;
-                    if (args[2]
-                     /* There were two args on commandline */
-                     && (gr = getgrnam(name))
-                     /* The group was not deleted in the meanwhile */
-                     && (p = strrchr(line, ':'))
-                     /* We can find a pointer to the last ':' */
-                    ) {
-                        error = MEMBER_NOT_FOUND;
-                        /* Move past ':' (worst case to '\0') and cut the line */
-                        p[1] = '\0';
-                        /* Reuse p */
-                        for (p = xzalloc(1); *gr->gr_mem != NULL; gr->gr_mem++) {
-                            /* Add all the other group members */
-                            if (strcmp(args[1], *gr->gr_mem) != 0) {
-                                del = p;
-                                p = xasprintf("%s%s%s", p, p[0] ? "," : "", *gr->gr_mem);
-                                free(del);
-                            } else
-                                error = STATUS_OK;
-                        }
-                        /* Recompose the line */
-                        line = xasprintf("%s%s\n", line, p);
-                        if (ENABLE_FEATURE_CLEAN_UP) free(p);
-                    } else
-                        goto skip;
+    switch (argc) {
+    case 3:
+        if (!ENABLE_FEATURE_DEL_USER_FROM_GROUP || do_deluser)
+            break;
+        /* It's "delgroup USER GROUP" */
+        member = name;
+        name = argv[2];
+        /* Fallthrough */
+
+    case 2:
+        if (do_deluser) {
+            /* "deluser USER" */
+            xgetpwnam(name); /* bail out if USER is wrong */
+            pfile = bb_path_passwd_file;
+            if (ENABLE_FEATURE_SHADOWPASSWDS)
+                sfile = bb_path_shadow_file;
+        } else {
+            struct group *gr;
+ do_delgroup:
+            /* "delgroup GROUP" or "delgroup USER GROUP" */
+            if (do_deluser < 0) { /* delgroup after deluser? */
+                gr = getgrnam(name);
+                if (!gr)
+                    return EXIT_SUCCESS;
+            } else {
+                gr = xgetgrnam(name); /* bail out if GROUP is wrong */
+            }
+            if (!member) {
+                /* "delgroup GROUP" */
+                struct passwd *pw;
+                struct passwd pwent;
+                /* Check if the group is in use */
+#define passwd_buf bb_common_bufsiz1
+                while (!getpwent_r(&pwent, passwd_buf, sizeof(passwd_buf), &pw)) {
+                    if (pwent.pw_gid == gr->gr_gid)
+                        bb_error_msg_and_die("'%s' still has '%s' as their primary group!", pwent.pw_name, name);
                 }
+                //endpwent();
             }
-            del = new;
-            new = xasprintf("%s%s", new, line);
-            free(del);
- skip:
-            free(line);
+            pfile = bb_path_group_file;
+            if (ENABLE_FEATURE_SHADOWPASSWDS)
+                sfile = bb_path_gshadow_file;
         }
 
-        if (ENABLE_FEATURE_CLEAN_UP) fclose(passwd);
+        /* Modify pfile, then sfile */
+        do {
+            if (update_passwd(pfile, name, NULL, member) == -1)
+                return EXIT_FAILURE;
+            if (ENABLE_FEATURE_SHADOWPASSWDS) {
+                pfile = sfile;
+                sfile = NULL;
+            }
+        } while (ENABLE_FEATURE_SHADOWPASSWDS && pfile);
 
-        if (error) {
-            if (ENABLE_FEATURE_DEL_USER_FROM_GROUP && error == MEMBER_NOT_FOUND) {
-                /* Set the correct values for error message */
-                filename = name;
-                name = args[1];
-            }
-            bb_error_msg("can't find %s in %s", name, filename);
-        } else {
-            passwd = fopen_func(filename, "w");
-            if (passwd) {
-                fputs(new, passwd);
-                if (ENABLE_FEATURE_CLEAN_UP) fclose(passwd);
-            }
+        if (ENABLE_DELGROUP && do_deluser > 0) {
+            /* "deluser USER" also should try to delete
+             * same-named group. IOW: do "delgroup USER"
+             */
+// On debian deluser is a perl script that calls userdel.
+// From man userdel:
+//  If USERGROUPS_ENAB is defined to yes in /etc/login.defs, userdel will
+//  delete the group with the same name as the user.
+            do_deluser = -1;
+            goto do_delgroup;
         }
+        return EXIT_SUCCESS;
     }
-    free(new);
+    /* Reached only if number of command line args is wrong */
+    bb_show_usage();
 }
-
-int deluser_main(int argc, char **argv);
-int deluser_main(int argc, char **argv)
-{
-    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)
-         || ENABLE_DELUSER
-         || (ENABLE_DELGROUP && ENABLE_DESKTOP)
-        ) {
-            if (ENABLE_DELUSER
-             && (!ENABLE_DELGROUP || applet_name[3] == 'u')
-            ) {
-                del_line_matching(argv, bb_path_passwd_file, xfopen);
-                if (ENABLE_FEATURE_SHADOWPASSWDS)
-                    del_line_matching(argv, bb_path_shadow_file, fopen_or_warn);
-            } else if (ENABLE_DESKTOP && ENABLE_DELGROUP && getpwnam(argv[1]))
-                bb_error_msg_and_die("can't remove primary group of user %s", argv[1]);
-        }
-        del_line_matching(argv, bb_path_group_file, xfopen);
-        if (ENABLE_FEATURE_SHADOWPASSWDS)
-            del_line_matching(argv, bb_path_gshadow_file, fopen_or_warn);
-        return EXIT_SUCCESS;
-    } else
-        bb_show_usage();
-}