udhcpc: fix a problem with binary-encoded options #2

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

diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index e234d6678966e2e20f1ad1d091b38551d881f843..e39ac55069723e2bd116be8704e918fcb5b70199 100644 (file)
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -9,48 +9,107 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  *
  */
-#include "libbb.h"
 
-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);
-}
+//usage:#define deluser_trivial_usage
+//usage:       "USER"
+//usage:#define deluser_full_usage "\n\n"
+//usage:       "Delete USER from the system"
+
+//usage:#define delgroup_trivial_usage
+//usage:       IF_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
+//usage:#define delgroup_full_usage "\n\n"
+//usage:       "Delete group GROUP from the system"
+//usage:       IF_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
+
+#include "libbb.h"
 
 int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int deluser_main(int argc, char **argv)
 {
-       if (argc != 2
-        && (!ENABLE_FEATURE_DEL_USER_FROM_GROUP
-           || (applet_name[3] != 'g' || argc != 3))
-       ) {
-               bb_show_usage();
-       }
+       /* 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? */
+       int do_deluser = (ENABLE_DELUSER && (!ENABLE_DELGROUP || applet_name[3] == 'u'));
 
-       if (geteuid())
+       if (geteuid() != 0)
                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)
+       name = argv[1];
+       member = NULL;
+
+       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 {
+                       struct group *gr;
+ do_delgroup:
+                       /* "delgroup GROUP" or "delgroup USER GROUP" */
+                       if (do_deluser < 0) { /* delgroup after deluser? */
+                               gr = getgrnam(name);
+                               if (!gr)
+                                       return EXIT_SUCCESS;
+                       } else {
+                               gr = xgetgrnam(name); /* bail out if GROUP is wrong */
+                       }
+                       if (!member) {
+                               /* "delgroup GROUP" */
+                               struct passwd *pw;
+                               struct passwd pwent;
+                               /* Check if the group is in use */
+#define passwd_buf bb_common_bufsiz1
+                               while (!getpwent_r(&pwent, passwd_buf, sizeof(passwd_buf), &pw)) {
+                                       if (pwent.pw_gid == gr->gr_gid)
+                                               bb_error_msg_and_die("'%s' still has '%s' as their primary group!", pwent.pw_name, name);
+                               }
+                               //endpwent();
+                       }
+                       pfile = bb_path_group_file;
+                       if (ENABLE_FEATURE_SHADOWPASSWDS)
+                               sfile = bb_path_gshadow_file;
+               }
+
+               /* Modify pfile, then sfile */
+               do {
+                       if (update_passwd(pfile, name, NULL, member) == -1)
                                return EXIT_FAILURE;
                        if (ENABLE_FEATURE_SHADOWPASSWDS) {
-                               del_line_matching(argv, bb_path_shadow_file);
+                               pfile = sfile;
+                               sfile = NULL;
                        }
-               } 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);
+               } while (ENABLE_FEATURE_SHADOWPASSWDS && pfile);
+
+               if (ENABLE_DELGROUP && do_deluser > 0) {
+                       /* "deluser USER" also should try to delete
+                        * same-named group. IOW: do "delgroup USER"
+                        */
+// On debian deluser is a perl script that calls userdel.
+// From man userdel:
+//  If USERGROUPS_ENAB is defined to yes in /etc/login.defs, userdel will
+//  delete the group with the same name as the user.
+                       do_deluser = -1;
+                       goto do_delgroup;
+               }
+               return EXIT_SUCCESS;
        }
-       return EXIT_SUCCESS;
+       /* Reached only if number of command line args is wrong */
+       bb_show_usage();
 }