Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/loginutils/deluser.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

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

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * deluser (remove lusers from the system ;) for TinyLogin
+ * deluser/delgroup implementation for busybox
  *
  * Copyright (C) 1999 by Lineo, inc. and John Beppu
  * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
- * Unified with delgroup by Tito Ragusa <farmatito@tiscali.it>
+ * Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  *
  */
 
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 
-/* where to start and stop deletion */
-typedef struct {
-    size_t start;
-    size_t stop;
-} Bounds;
+/* Status */
+#define STATUS_OK            0
+#define NAME_NOT_FOUND       1
+#define MEMBER_NOT_FOUND     2
 
-/* An interesting side-effect of boundary()'s
- * implementation is that the first user (typically root)
- * cannot be removed.  Let's call it a feature. */
-static inline Bounds boundary(const char *buffer, const char *login)
+static void del_line_matching(char **args,
+        const char *filename,
+        FILE *(*fopen_func)(const char *fileName, const char *mode))
 {
-    char needle[256];
-    char *start;
-    char *stop;
-    Bounds b;
+    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);
 
-    snprintf(needle, 256, "\n%s:", login);
-    needle[255] = 0;
-    start = strstr(buffer, needle);
-    if (!start) {
-        b.start = 0;
-        b.stop = 0;
-        return b;
+    passwd = fopen_func(filename, "r");
+    if (passwd) {
+        while ((line = xmalloc_fgets(passwd))) {
+            int len = strlen(name);
+
+            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;
+                }
+            }
+            del = new;
+            new = xasprintf("%s%s", new, line);
+            free(del);
+ skip:
+            free(line);
+        }
+
+        if (ENABLE_FEATURE_CLEAN_UP) fclose(passwd);
+
+        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);
+            }
+        }
     }
-    start++;
-
-    stop = strchr(start, '\n');
-    b.start = start - buffer;
-    b.stop = stop - buffer;
-    return b;
+    free(new);
 }
 
-/* grep -v ^login (except it only deletes the first match) */
-/* ...in fact, I think I'm going to simplify this later */
-static void del_line_matching(const char *login, const char *filename)
-{
-    char *buffer;
-    FILE *passwd;
-    Bounds b;
-    struct stat statbuf;
-
-
-    if ((passwd = bb_wfopen(filename, "r"))) {
-        xstat(filename, &statbuf);
-        buffer = (char *) xmalloc(statbuf.st_size * sizeof(char));
-        fread(buffer, statbuf.st_size, sizeof(char), passwd);
-        fclose(passwd);
-        /* find the user to remove */
-        b = boundary(buffer, login);
-        if (b.stop != 0) {
-            /* write the file w/o the user */
-            if ((passwd = bb_wfopen(filename, "w"))) {
-                fwrite(buffer, (b.start - 1), sizeof(char), passwd);
-                fwrite(&buffer[b.stop], (statbuf.st_size - b.stop), sizeof(char), passwd);
-                fclose(passwd);
-            }
-        } else {
-            bb_error_msg("Can't find '%s' in '%s'", login, filename);
-        }
-        free(buffer);
-    }
-}
-
+int deluser_main(int argc, char **argv);
 int deluser_main(int argc, char **argv)
 {
-    if (argc != 2) {
+    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();
-    } else {
-        if (ENABLE_DELUSER && bb_applet_name[3] == 'u') {
-            del_line_matching(argv[1], bb_path_passwd_file);
-            if (ENABLE_FEATURE_SHADOWPASSWDS)
-                del_line_matching(argv[1], bb_path_shadow_file);
-        }
-        del_line_matching(argv[1], bb_path_group_file);
-        if (ENABLE_FEATURE_SHADOWPASSWDS)
-            del_line_matching(argv[1], bb_path_gshadow_file);
-    }
-    return (EXIT_SUCCESS);
 }
-
-/* $Id: deluser.c,v 1.4 2003/07/14 20:20:45 andersen Exp $ */