Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/loginutils/addgroup.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/loginutils/addgroup.c (modified) (9 diffs)

branches/2.2.9/mindi-busybox/loginutils/addgroup.c

@@ -7 +7 @@
  * Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  */
-
 #include "libbb.h"
 
+#if CONFIG_LAST_SYSTEM_ID < CONFIG_FIRST_SYSTEM_ID
+#error Bad LAST_SYSTEM_ID or FIRST_SYSTEM_ID in .config
+#endif
+
+#define OPT_GID                       (1 << 0)
+#define OPT_SYSTEM_ACCOUNT            (1 << 1)
+
+/* We assume GID_T_MAX == INT_MAX */
 static void xgroup_study(struct group *g)
 {
+    unsigned max = INT_MAX;
+
     /* Make sure gr_name is unused */
     if (getgrnam(g->gr_name)) {
-        goto error;
+        bb_error_msg_and_die("%s '%s' in use", "group", g->gr_name);
+        /* these format strings are reused in adduser and addgroup */
     }
 
+    /* if a specific gid is requested, the --system switch and */
+    /* min and max values are overridden, and the range of valid */
+    /* gid values is set to [0, INT_MAX] */
+    if (!(option_mask32 & OPT_GID)) {
+        if (option_mask32 & OPT_SYSTEM_ACCOUNT) {
+            g->gr_gid = CONFIG_FIRST_SYSTEM_ID;
+            max = CONFIG_LAST_SYSTEM_ID;
+        } else {
+            g->gr_gid = CONFIG_LAST_SYSTEM_ID + 1;
+            max = 64999;
+        }
+    }
     /* Check if the desired gid is free
      * or find the first free one */
@@ -26 +48 @@
             return; /* found free group: return */
         }
-        if (option_mask32) {
+        if (option_mask32 & OPT_GID) {
             /* -g N, cannot pick gid other than N: error */
-            g->gr_name = itoa(g->gr_gid);
-            goto error;
+            bb_error_msg_and_die("%s '%s' in use", "gid", itoa(g->gr_gid));
+            /* this format strings is reused in adduser and addgroup */
+        }
+        if (g->gr_gid == max) {
+            /* overflowed: error */
+            bb_error_msg_and_die("no %cids left", 'g');
+            /* this format string is reused in adduser and addgroup */
         }
         g->gr_gid++;
-        if (g->gr_gid <= 0) {
-            /* overflowed: error */
-            bb_error_msg_and_die("no gids left");
-        }
     }
-
- error:
-    /* exit */
-    bb_error_msg_and_die("group %s already exists", g->gr_name);
 }
 
@@ -46 +65 @@
 static void new_group(char *group, gid_t gid)
 {
-    FILE *file;
     struct group gr;
+    char *p;
 
     /* make sure gid and group haven't already been allocated */
@@ -55 +74 @@
 
     /* add entry to group */
-    file = xfopen(bb_path_group_file, "a");
-    /* group:passwd:gid:userlist */
-    fprintf(file, "%s:x:%d:\n", group, gr.gr_gid);
+    p = xasprintf("x:%u:", (unsigned) gr.gr_gid);
+    if (update_passwd(bb_path_group_file, group, p, NULL) < 0)
+        exit(EXIT_FAILURE);
     if (ENABLE_FEATURE_CLEAN_UP)
-        fclose(file);
+        free(p);
 #if ENABLE_FEATURE_SHADOWPASSWDS
-    file = fopen_or_warn(bb_path_gshadow_file, "a");
-    if (file) {
-        fprintf(file, "%s:!::\n", group);
-        if (ENABLE_FEATURE_CLEAN_UP)
-            fclose(file);
-    }
+    /* /etc/gshadow fields:
+     * 1. Group name.
+     * 2. Encrypted password.
+     *    If set, non-members of the group can join the group
+     *    by typing the password for that group using the newgrp command.
+     *    If the value is of this field ! then no user is allowed
+     *    to access the group using the newgrp command. A value of !!
+     *    is treated the same as a value of ! only it indicates
+     *    that a password has never been set before. If the value is null,
+     *    only group members can log into the group.
+     * 3. Group administrators (comma delimited list).
+     *    Group members listed here can add or remove group members
+     *    using the gpasswd command.
+     * 4. Group members (comma delimited list).
+     */
+    /* Ignore errors: if file is missing we assume admin doesn't want it */
+    update_passwd(bb_path_gshadow_file, group, "!::", NULL);
 #endif
 }
 
-#if ENABLE_FEATURE_ADDUSER_TO_GROUP
-static void add_user_to_group(char **args,
-        const char *path,
-        FILE *(*fopen_func)(const char *fileName, const char *mode))
-{
-    char *line;
-    int len = strlen(args[1]);
-    llist_t *plist = NULL;
-    FILE *group_file;
-
-    group_file = fopen_func(path, "r");
-
-    if (!group_file) return;
-
-    while ((line = xmalloc_getline(group_file))) {
-        /* Find the group */
-        if (!strncmp(line, args[1], len)
-         && line[len] == ':'
-        ) {
-            /* Add the new user */
-            line = xasprintf("%s%s%s", line,
-                        last_char_is(line, ':') ? "" : ",",
-                        args[0]);
-        }
-        llist_add_to_end(&plist, line);
-    }
-
-    if (ENABLE_FEATURE_CLEAN_UP) {
-        fclose(group_file);
-        group_file = fopen_func(path, "w");
-        while ((line = llist_pop(&plist))) {
-            if (group_file)
-                fprintf(group_file, "%s\n", line);
-            free(line);
-        }
-        if (group_file)
-            fclose(group_file);
-    } else {
-        group_file = fopen_func(path, "w");
-        if (group_file)
-            while ((line = llist_pop(&plist)))
-                fprintf(group_file, "%s\n", line);
-    }
-}
+#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS
+static const char addgroup_longopts[] ALIGN1 =
+        "gid\0"                 Required_argument "g"
+        "system\0"              No_argument       "S"
+        ;
 #endif
 
@@ -123 +114 @@
  * will add an existing user to an existing group.
  */
-int addgroup_main(int argc, char **argv);
-int addgroup_main(int argc, char **argv)
+int addgroup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int addgroup_main(int argc UNUSED_PARAM, char **argv)
 {
-    char *group;
-    gid_t gid = 0;
+    unsigned opts;
+    unsigned gid = 0;
 
     /* need to be root */
@@ -133 +124 @@
         bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
     }
-
+#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS
+    applet_long_options = addgroup_longopts;
+#endif
     /* Syntax:
      *  addgroup group
@@ -139 +132 @@
      *  addgroup user group
      * Check for min, max and missing args */
-    opt_complementary = "-1:?2";
-    if (getopt32(argv, "g:", &group)) {
-        gid = xatoul_range(group, 0, ((unsigned long)(gid_t)ULONG_MAX) >> 1);
-    }
+    opt_complementary = "-1:?2:g+";
+    opts = getopt32(argv, "g:S", &gid);
     /* move past the commandline options */
     argv += optind;
-    argc -= optind;
+    //argc -= optind;
 
 #if ENABLE_FEATURE_ADDUSER_TO_GROUP
-    if (argc == 2) {
+    if (argv[1]) {
         struct group *gr;
 
-        if (option_mask32) {
+        if (opts & OPT_GID) {
             /* -g was there, but "addgroup -g num user group"
              * is a no-no */
@@ -159 +150 @@
         /* check if group and user exist */
         xuname2uid(argv[0]); /* unknown user: exit */
-        xgroup2gid(argv[1]); /* unknown group: exit */
+        gr = xgetgrnam(argv[1]); /* unknown group: exit */
         /* check if user is already in this group */
-        gr = getgrnam(argv[1]);
         for (; *(gr->gr_mem) != NULL; (gr->gr_mem)++) {
             if (!strcmp(argv[0], *(gr->gr_mem))) {
@@ -168 +158 @@
             }
         }
-        add_user_to_group(argv, bb_path_group_file, xfopen);
-#if ENABLE_FEATURE_SHADOWPASSWDS
-        add_user_to_group(argv, bb_path_gshadow_file, fopen_or_warn);
-#endif /* ENABLE_FEATURE_SHADOWPASSWDS */
+        if (update_passwd(bb_path_group_file, argv[1], NULL, argv[0]) < 0) {
+            return EXIT_FAILURE;
+        }
+# if ENABLE_FEATURE_SHADOWPASSWDS
+        update_passwd(bb_path_gshadow_file, argv[1], NULL, argv[0]);
+# endif
     } else
 #endif /* ENABLE_FEATURE_ADDUSER_TO_GROUP */
+    {
+        die_if_bad_username(argv[0]);
         new_group(argv[0], gid);
-
+    }
     /* Reached only on success */
     return EXIT_SUCCESS;