ntpd: fix comment, no code changes

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

diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 1cd2b01e38765870f03e10be49cc9f3a132fc571..293e324b06147340007959e9616f0a475b067ff1 100644 (file)
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -1,68 +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>
+ * Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  *
  */
+#include "libbb.h"
 
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "busybox.h"
-
-
-#include "delline.c"
-
-static const char deluser_format[]="%s: User could not be removed from %s";
+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)
 {
-       /* int successful; */
-       int failure;
-
-       if (argc != 2) {
+       if (argc != 2
+        && (!ENABLE_FEATURE_DEL_USER_FROM_GROUP
+           || (applet_name[3] != 'g' || argc != 3))
+       ) {
                bb_show_usage();
-       } else {
-
-               failure = del_line_matching(argv[1], bb_path_passwd_file);
-               if (failure) {
-                       bb_error_msg_and_die(deluser_format, argv[1], bb_path_passwd_file);
-               }
-#ifdef CONFIG_FEATURE_SHADOWPASSWDS
-               failure = del_line_matching(argv[1], bb_path_shadow_file);
-               if (failure) {
-                       bb_error_msg_and_die(deluser_format, argv[1], bb_path_shadow_file);
-               }
-               failure = del_line_matching(argv[1], bb_path_gshadow_file);
-               if (failure) {
-                       bb_error_msg_and_die(deluser_format, argv[1], bb_path_gshadow_file);
-               }
-#endif
-               failure = del_line_matching(argv[1], bb_path_group_file);
-               if (failure) {
-                       bb_error_msg_and_die(deluser_format, argv[1], bb_path_group_file);
-               }
+       }
 
+       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 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);
        }
-       return (EXIT_SUCCESS);
+       return EXIT_SUCCESS;
 }
-
-/* $Id: deluser.c,v 1.4 2003/07/14 20:20:45 andersen Exp $ */