telnetd: write LOGIN/DEAD_PROCESS utmp records. Closes bug 1363

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

diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index bbbd77dbd067d676611573594b85b049ef7036d2..293e324b06147340007959e9616f0a475b067ff1 100644 (file)
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -1,96 +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"
-
-/* where to start and stop deletion */
-typedef struct {
-       size_t start;
-       size_t stop;
-} Bounds;
-
-/* 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 int del_line_matching(char **args, const char *filename)
 {
-       char needle[256];
-       char *start;
-       char *stop;
-       Bounds b;
-
-       snprintf(needle, 256, "\n%s:", login);
-       needle[255] = 0;
-       start = strstr(buffer, needle);
-       if (!start) {
-               b.start = 0;
-               b.stop = 0;
-               return b;
+       if (ENABLE_FEATURE_DEL_USER_FROM_GROUP && args[2]) {
+               return update_passwd(filename, args[2], NULL, args[1]);
        }
-       start++;
-
-       stop = strchr(start, '\n');
-       b.start = start - buffer;
-       b.stop = stop - buffer;
-       return b;
+       return update_passwd(filename, args[1], NULL, NULL);
 }
 
-/* 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)
+int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int deluser_main(int argc, char **argv)
 {
-       char *buffer;
-       FILE *passwd;
-       Bounds b;
-       struct stat statbuf;
-
+       if (argc != 2
+        && (!ENABLE_FEATURE_DEL_USER_FROM_GROUP
+           || (applet_name[3] != 'g' || argc != 3))
+       ) {
+               bb_show_usage();
+       }
 
-       if ((passwd = bb_wfopen(filename, "r"))) {
-               // Remove pointless const.
-               xstat((char *)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);
+       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)
+                               return EXIT_FAILURE;
+                       if (ENABLE_FEATURE_SHADOWPASSWDS) {
+                               del_line_matching(argv, bb_path_shadow_file);
                        }
-               } else {
-                       bb_error_msg("can't find '%s' in '%s'", login, filename);
-               }
-               free(buffer);
+               } else if (ENABLE_DESKTOP && ENABLE_DELGROUP && getpwnam(argv[1]))
+                       bb_error_msg_and_die("can't remove primary group of user %s", argv[1]);
        }
-}
-
-int deluser_main(int argc, char **argv)
-{
-       if (argc != 2) {
-               bb_show_usage();
-       } else {
-               if (ENABLE_DELUSER && 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);
+       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);
        }
-       return (EXIT_SUCCESS);
+       return EXIT_SUCCESS;
 }
-
-/* $Id: deluser.c,v 1.4 2003/07/14 20:20:45 andersen Exp $ */