Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/loginutils/adduser.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/loginutils/adduser.c (modified) (9 diffs)

branches/3.3/mindi-busybox/loginutils/adduser.c

@@ -8 +8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config ADDUSER
+//config:   bool "adduser"
+//config:   default y
+//config:   help
+//config:     Utility for creating a new user account.
+//config:
+//config:config FEATURE_ADDUSER_LONG_OPTIONS
+//config:   bool "Enable long options"
+//config:   default y
+//config:   depends on ADDUSER && LONG_OPTS
+//config:   help
+//config:     Support long options for the adduser applet.
+//config:
+//config:config FEATURE_CHECK_NAMES
+//config:   bool "Enable sanity check on user/group names in adduser and addgroup"
+//config:   default n
+//config:   depends on ADDUSER || ADDGROUP
+//config:   help
+//config:     Enable sanity check on user and group names in adduser and addgroup.
+//config:     To avoid problems, the user or group name should consist only of
+//config:     letters, digits, underscores, periods, at signs and dashes,
+//config:     and not start with a dash (as defined by IEEE Std 1003.1-2001).
+//config:     For compatibility with Samba machine accounts "$" is also supported
+//config:     at the end of the user or group name.
+//config:
+//config:config LAST_ID
+//config:   int "Last valid uid or gid for adduser and addgroup"
+//config:   depends on ADDUSER || ADDGROUP
+//config:   default 60000
+//config:   help
+//config:     Last valid uid or gid for adduser and addgroup
+//config:
+//config:config FIRST_SYSTEM_ID
+//config:   int "First valid system uid or gid for adduser and addgroup"
+//config:   depends on ADDUSER || ADDGROUP
+//config:   range 0 LAST_ID
+//config:   default 100
+//config:   help
+//config:     First valid system uid or gid for adduser and addgroup
+//config:
+//config:config LAST_SYSTEM_ID
+//config:   int "Last valid system uid or gid for adduser and addgroup"
+//config:   depends on ADDUSER || ADDGROUP
+//config:   range FIRST_SYSTEM_ID LAST_ID
+//config:   default 999
+//config:   help
+//config:     Last valid system uid or gid for adduser and addgroup
+
+//applet:IF_ADDUSER(APPLET(adduser, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_ADDUSER) += adduser.o
 
 //usage:#define adduser_trivial_usage
@@ -21 +72 @@
 //usage:     "\n    -H      Don't create home directory"
 //usage:     "\n    -u UID      User id"
+//usage:     "\n    -k SKEL     Skeleton directory (/etc/skel)"
 
 #include "libbb.h"
@@ -27 +79 @@
 #error Bad LAST_SYSTEM_ID or FIRST_SYSTEM_ID in .config
 #endif
+#if CONFIG_LAST_ID < CONFIG_LAST_SYSTEM_ID
+#error Bad LAST_ID or LAST_SYSTEM_ID in .config
+#endif
+
 
 /* #define OPT_HOME           (1 << 0) */ /* unused */
@@ -36 +92 @@
 #define OPT_DONT_MAKE_HOME (1 << 6)
 #define OPT_UID            (1 << 7)
-
-/* We assume UID_T_MAX == INT_MAX */
+#define OPT_SKEL           (1 << 8)
+
 /* remix */
 /* recoded such that the uid may be passed in *p */
 static void passwd_study(struct passwd *p)
 {
-    int max = UINT_MAX;
+    int max = CONFIG_LAST_ID;
 
     if (getpwnam(p->pw_name)) {
@@ -55 +111 @@
         } else {
             p->pw_uid = CONFIG_LAST_SYSTEM_ID + 1;
-            max = 64999;
         }
     }
@@ -133 +188 @@
         "no-create-home\0"      No_argument       "H"
         "uid\0"                 Required_argument "u"
+        "skel\0"                Required_argument "k"
         ;
 #endif
@@ -148 +204 @@
     char *p;
     unsigned opts;
+    char *uid;
+    const char *skel = "/etc/skel";
 
 #if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
@@ -163 +221 @@
     pw.pw_dir = NULL;
 
-    /* at most two non-option args */
+    /* at least one and at most two non-option args */
     /* disable interactive passwd for system accounts */
-    opt_complementary = "?2:SD:u+";
-    if (sizeof(pw.pw_uid) == sizeof(int)) {
-        opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &pw.pw_uid);
-    } else {
-        unsigned uid;
-        opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid);
-        if (opts & OPT_UID) {
-            pw.pw_uid = uid;
-        }
-    }
+    opt_complementary = "-1:?2:SD";
+    opts = getopt32(argv, "h:g:s:G:DSHu:k:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid, &skel);
+    if (opts & OPT_UID)
+        pw.pw_uid = xatou_range(uid, 0, CONFIG_LAST_ID);
+
     argv += optind;
     pw.pw_name = argv[0];
@@ -253 +306 @@
             };
             /* Be silent on any errors (like: no /etc/skel) */
-            logmode = LOGMODE_NONE;
-            copy_file("/etc/skel", pw.pw_dir, FILEUTILS_RECUR);
+            if (!(opts & OPT_SKEL))
+                logmode = LOGMODE_NONE;
+            copy_file(skel, pw.pw_dir, FILEUTILS_RECUR);
             logmode = LOGMODE_STDIO;
             chown_main(4, (char**)args);