typo fix

[platform/upstream/busybox.git] / loginutils / deluser.c

diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index e9bde00..12fbbc6 100644 (file)
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -1,83 +1,95 @@
 /* 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.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  *
  */
+#include "libbb.h"
 
-#include "busybox.h"
-
-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 *line;
-       FILE *passwd;
-       int len = strlen(login);
-       int found = 0;
-       llist_t *plist = NULL;
+       /* 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? */
+       bool do_deluser = (ENABLE_DELUSER && (!ENABLE_DELGROUP || applet_name[3] == 'u'));
 
-       passwd = fopen_or_warn(filename, "r");
-       if (!passwd) return;
+       if (geteuid() != 0)
+               bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
-       while ((line = xmalloc_fgets(passwd))) {
-               if (!strncmp(line, login, len)
-                && line[len] == ':'
-               ) {
-                       found++;
-                       free(line);
-               } else {
-                       llist_add_to_end(&plist, line);
-               }
-       }
+       name = argv[1];
+       member = NULL;
 
-       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);
+       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 {
+ do_delgroup:
+                       /* "delgroup GROUP" or "delgroup USER GROUP" */
+                       xgetgrnam(name); /* bail out if GROUP is wrong */
+                       if (!member) {
+                               /* "delgroup GROUP".
+                                * If user with the same name exists,
+                                * bail out.
+                                */
+//BUG: check should be done by GID, not by matching name!
+//1. find GROUP's GID
+//2. check that /etc/passwd doesn't have lines of the form
+//   user:pwd:uid:GID:...
+//3. bail out if at least one such line exists
+                               if (getpwnam(name) != NULL)
+                                       bb_error_msg_and_die("'%s' still has '%s' as their primary group!", name, name);
                        }
-                       fclose(passwd);
+                       pfile = bb_path_group_file;
+                       if (ENABLE_FEATURE_SHADOWPASSWDS)
+                               sfile = bb_path_gshadow_file;
                }
-       }
-}
 
-int deluser_main(int argc, char **argv);
-int deluser_main(int argc, char **argv)
-{
-       if (argc != 2)
-               bb_show_usage();
+               /* 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 (ENABLE_DELUSER
-        && (!ENABLE_DELGROUP || 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);
+               if (ENABLE_DELGROUP && do_deluser) {
+                       /* "deluser USER" also should try to delete
+                        * same-named group. IOW: do "delgroup USER"
+                        */
+//TODO: check how it actually works in upstream.
+//I suspect it is only done if group has no more members.
+                       do_deluser = 0;
+                       goto do_delgroup;
+               }
+               return EXIT_SUCCESS;
        }
-       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;
+       /* Reached only if number of command line args is wrong */
+       bb_show_usage();
 }
-