Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/loginutils/addgroup.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/loginutils/addgroup.c (modified) (3 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * addgroup - add users to /etc/passwd and /etc/shadow
+ * addgroup - add groups to /etc/group and /etc/gshadow
  *
  * 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>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
@@ -10 +11 @@
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include "libbb.h"
 
-#include "busybox.h"
+static void xgroup_study(struct group *g)
+{
+    /* Make sure gr_name is unused */
+    if (getgrnam(g->gr_name)) {
+        goto error;
+    }
 
-/* make sure gr_name isn't taken, make sure gid is kosher
- * return 1 on failure */
-static int group_study(struct group *g)
-{
-    FILE *etc_group;
-    gid_t desired;
-
-    struct group *grp;
-    const int max = 65000;
-
-    etc_group = bb_xfopen(bb_path_group_file, "r");
-
-    /* make sure gr_name isn't taken, make sure gid is kosher */
-    desired = g->gr_gid;
-    while ((grp = fgetgrent(etc_group))) {
-        if ((strcmp(grp->gr_name, g->gr_name)) == 0) {
-            bb_error_msg_and_die("%s: group already in use", g->gr_name);
+    /* Check if the desired gid is free
+     * or find the first free one */
+    while (1) {
+        if (!getgrgid(g->gr_gid)) {
+            return; /* found free group: return */
         }
-        if ((desired) && grp->gr_gid == desired) {
-            bb_error_msg_and_die("%d: gid already in use",
-                              desired);
+        if (option_mask32) {
+            /* -g N, cannot pick gid other than N: error */
+            g->gr_name = itoa(g->gr_gid);
+            goto error;
         }
-        if ((grp->gr_gid > g->gr_gid) && (grp->gr_gid < max)) {
-            g->gr_gid = grp->gr_gid;
+        g->gr_gid++;
+        if (g->gr_gid <= 0) {
+            /* overflowed: error */
+            bb_error_msg_and_die("no gids left");
         }
     }
-    fclose(etc_group);
 
-    /* gid */
-    if (desired) {
-        g->gr_gid = desired;
-    } else {
-        g->gr_gid++;
-    }
-    /* return 1; */
-    return 0;
+ error:
+    /* exit */
+    bb_error_msg_and_die("group %s already exists", g->gr_name);
 }
 
 /* append a new user to the passwd file */
-static int addgroup(char *group, gid_t gid, const char *user)
+static void new_group(char *group, gid_t gid)
 {
     FILE *file;
@@ -64 +52 @@
     gr.gr_gid = gid;
     gr.gr_name = group;
-    if (group_study(&gr))
-        return 1;
+    xgroup_study(&gr);
 
     /* add entry to group */
-    file = bb_xfopen(bb_path_group_file, "a");
+    file = xfopen(bb_path_group_file, "a");
     /* group:passwd:gid:userlist */
-    fprintf(file, "%s:%s:%d:%s\n", group, "x", gr.gr_gid, user);
-    fclose(file);
+    fprintf(file, "%s:x:%d:\n", group, gr.gr_gid);
+    if (ENABLE_FEATURE_CLEAN_UP)
+        fclose(file);
+#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);
+    }
+#endif
+}
 
-#if ENABLE_FEATURE_SHADOWPASSWDS
-    file = bb_xfopen(bb_path_gshadow_file, "a");
-    fprintf(file, "%s:!::\n", group);
-    fclose(file);
+#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);
+    }
+}
 #endif
-
-    /* return 1; */
-    return 0;
-}
 
 /*
  * addgroup will take a login_name as its first parameter.
  *
- * gid
- *
- * can be customized via command-line parameters.
- * ________________________________________________________________________ */
+ * gid can be customized via command-line parameters.
+ * If called with two non-option arguments, addgroup
+ * will add an existing user to an existing group.
+ */
+int addgroup_main(int argc, char **argv);
 int addgroup_main(int argc, char **argv)
 {
     char *group;
     gid_t gid = 0;
-    
-    /* check for min, max and missing args and exit on error */
-    bb_opt_complementally = "-1:?2:?";
 
-    if (bb_getopt_ulflags(argc, argv, "g:", &group)) {
-        gid = bb_xgetlarg(group, 10, 0, LONG_MAX);
+    /* need to be root */
+    if (geteuid()) {
+        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+    }
+
+    /* Syntax:
+     *  addgroup group
+     *  addgroup -g num group
+     *  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);
     }
     /* move past the commandline options */
     argv += optind;
+    argc -= optind;
 
-    /* need to be root */
-    if(geteuid()) {
-        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-    }
+#if ENABLE_FEATURE_ADDUSER_TO_GROUP
+    if (argc == 2) {
+        struct group *gr;
 
-    /* werk */
-    return addgroup(argv[0], gid, (argv[1]) ? argv[1] : "");
+        if (option_mask32) {
+            /* -g was there, but "addgroup -g num user group"
+             * is a no-no */
+            bb_show_usage();
+        }
+
+        /* check if group and user exist */
+        xuname2uid(argv[0]); /* unknown user: exit */
+        xgroup2gid(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))) {
+                /* user is already in group: do nothing */
+                return EXIT_SUCCESS;
+            }
+        }
+        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 */
+    } else
+#endif /* ENABLE_FEATURE_ADDUSER_TO_GROUP */
+        new_group(argv[0], gid);
+
+    /* Reached only on success */
+    return EXIT_SUCCESS;
 }