ntpd: fix comment, no code changes

[oweals/busybox.git] / loginutils / deluser.c

diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index e9bde00bd4a8aa47a0574bf48417ded9cd943f5b..293e324b06147340007959e9616f0a475b067ff1 100644 (file)
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -1,83 +1,56 @@
 /* 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 GPL version 2, see file LICENSE in this tarball for details.
  *
  */
+#include "libbb.h"
 
-#include "busybox.h"
-
-static void del_line_matching(const char *login, const char *filename)
+static int del_line_matching(char **args, const char *filename)
 {
-       char *line;
-       FILE *passwd;
-       int len = strlen(login);
-       int found = 0;
-       llist_t *plist = NULL;
-
-       passwd = fopen_or_warn(filename, "r");
-       if (!passwd) return;
-
-       while ((line = xmalloc_fgets(passwd))) {
-               if (!strncmp(line, login, len)
-                && line[len] == ':'
-               ) {
-                       found++;
-                       free(line);
-               } else {
-                       llist_add_to_end(&plist, line);
-               }
-       }
-
-       if (!ENABLE_FEATURE_CLEAN_UP) {
-               if (!found) {
-                       bb_error_msg("can't find '%s' in '%s'", login, filename);
-                       return;
-               }
-               passwd = fopen_or_warn(filename, "w");
-               if (passwd)
-                       while ((line = llist_pop(&plist)))
-                               fputs(line, passwd);
-       } else {
-               if (!found) {
-                       bb_error_msg("can't find '%s' in '%s'", login, filename);
-                       goto clean_up;
-               }
-               fclose(passwd);
-               passwd = fopen_or_warn(filename, "w");
-               if (passwd) {
- clean_up:
-                       while ((line = llist_pop(&plist))) {
-                               if (found) fputs(line, passwd);
-                               free(line);
-                       }
-                       fclose(passwd);
-               }
+       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);
+int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 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))
+       ) {
                bb_show_usage();
+       }
+
+       if (geteuid())
+               bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
-       if (ENABLE_DELUSER
-        && (!ENABLE_DELGROUP || applet_name[3] == 'u')
+       if ((ENABLE_FEATURE_DEL_USER_FROM_GROUP && argc != 3)
+        || ENABLE_DELUSER
+        || (ENABLE_DELGROUP && ENABLE_DESKTOP)
        ) {
-               del_line_matching(argv[1], bb_path_passwd_file);
-               if (ENABLE_FEATURE_SHADOWPASSWDS)
-                       del_line_matching(argv[1], bb_path_shadow_file);
+               if (ENABLE_DELUSER
+                && (!ENABLE_DELGROUP || applet_name[3] == 'u')
+               ) {
+                       if (del_line_matching(argv, bb_path_passwd_file) < 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);
        }
-       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;
 }
-