Make pw_scan(3) more compatible with getpwent(3) et. al. when processing

[pw-darwin.git] / pw / pw_user.c

diff --git a/pw/pw_user.c b/pw/pw_user.c
index cf38e9ccb345431b1b74b0b0ba63405266fa8027..148239ebd2b5f8a9e48af738b6bf34125cf60482 100644 (file)
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *
@@ -491,6 +493,7 @@ pw_pwcrypt(char *password)
        char            salt[SALTSIZE + 1];
        char            *cryptpw;
        static char     buf[256];
+       size_t          pwlen;
 
        /*
         * Calculate a salt value
@@ -502,7 +505,8 @@ pw_pwcrypt(char *password)
        cryptpw = crypt(password, salt);
        if (cryptpw == NULL)
                errx(EX_CONFIG, "crypt(3) failure");
-       assert(strlcpy(buf, cryptpw, sizeof(buf)) < sizeof(buf));
+       pwlen = strlcpy(buf, cryptpw, sizeof(buf));
+       assert(pwlen < sizeof(buf));
        return (buf);
 }
 
@@ -513,7 +517,9 @@ pw_password(struct userconf * cnf, char const * user, bool dryrun)
        char            pwbuf[32];
 
        switch (cnf->default_password) {
-       case -1:                /* Random password */
+       case P_NONE:            /* No password at all! */
+               return "";
+       case P_RANDOM:                  /* Random password */
                l = (arc4random() % 8 + 8);     /* 8 - 16 chars */
                for (i = 0; i < l; i++)
                        pwbuf[i] = chars[arc4random_uniform(sizeof(chars)-1)];
@@ -529,17 +535,13 @@ pw_password(struct userconf * cnf, char const * user, bool dryrun)
                        fflush(stdout);
                }
                break;
-
-       case -2:                /* No password at all! */
-               return "";
-
-       case 0:         /* No login - default */
-       default:
-               return "*";
-
-       case 1:         /* user's name */
+       case P_YES:             /* user's name */
                strlcpy(pwbuf, user, sizeof(pwbuf));
                break;
+       case P_NO:              /* No login - default */
+                               /* FALLTHROUGH */
+       default:
+               return "*";
        }
        return pw_pwcrypt(pwbuf);
 }
@@ -630,7 +632,7 @@ pw_checkname(char *name, int gecos)
        reject = 0;
        if (gecos) {
                /* See if the name is valid as a gecos (comment) field. */
-               badchars = ":!@";
+               badchars = ":";
                showtype = "gecos field";
        } else {
                /* See if the name is valid as a userid or group. */
@@ -1085,10 +1087,10 @@ split_groups(StringList **groups, char *groupsstr)
        char *p;
        char tok[] = ", \t";
 
+       if (*groups == NULL)
+               *groups = sl_init();
        for (p = strtok(groupsstr, tok); p != NULL; p = strtok(NULL, tok)) {
                grp = group_from_name_or_id(p);
-               if (*groups == NULL)
-                       *groups = sl_init();
                sl_add(*groups, newstr(grp->gr_name));
        }
 }
@@ -1120,11 +1122,20 @@ validate_mode(char *mode)
        return (m);
 }
 
+static long
+validate_expire(char *str, int opt)
+{
+       if (!numerics(str))
+               errx(EX_DATAERR, "-%c argument must be numeric "
+                    "when setting defaults: %s", (char)opt, str);
+       return strtol(str, NULL, 0);
+}
+
 static void
 mix_config(struct userconf *cmdcnf, struct userconf *cfg)
 {
 
-       if (cmdcnf->default_password == 0)
+       if (cmdcnf->default_password < 0)
                cmdcnf->default_password = cfg->default_password;
        if (cmdcnf->reuse_uids == 0)
                cmdcnf->reuse_uids = cfg->reuse_uids;
@@ -1162,9 +1173,9 @@ mix_config(struct userconf *cmdcnf, struct userconf *cfg)
                cmdcnf->min_gid = cfg->min_gid;
        if (cmdcnf->max_gid == 0)
                cmdcnf->max_gid = cfg->max_gid;
-       if (cmdcnf->expire_days == 0)
+       if (cmdcnf->expire_days < 0)
                cmdcnf->expire_days = cfg->expire_days;
-       if (cmdcnf->password_days == 0)
+       if (cmdcnf->password_days < 0)
                cmdcnf->password_days = cfg->password_days;
 }
 
@@ -1196,11 +1207,14 @@ pw_user_add(int argc, char **argv, char *arg1)
        if ((cmdcnf = calloc(1, sizeof(struct userconf))) == NULL)
                err(EXIT_FAILURE, "calloc()");
 
+       cmdcnf->default_password = cmdcnf->expire_days = cmdcnf->password_days = -1; 
+       now = time(NULL);
+
        if (arg1 != NULL) {
                if (arg1[strspn(arg1, "0123456789")] == '\0')
                        id = pw_checkid(arg1, UID_MAX);
                else
-                       name = arg1;
+                       name = pw_checkname(arg1, 0);
        }
 
        while ((ch = getopt(argc, argv, args)) != -1) {
@@ -1212,7 +1226,7 @@ pw_user_add(int argc, char **argv, char *arg1)
                        quiet = true;
                        break;
                case 'n':
-                       name = optarg;
+                       name = pw_checkname(optarg, 0);
                        break;
                case 'u':
                        userid = optarg;
@@ -1224,12 +1238,16 @@ pw_user_add(int argc, char **argv, char *arg1)
                        homedir = optarg;
                        break;
                case 'e':
-                       now = time(NULL);
-                       cmdcnf->expire_days = parse_date(now, optarg);
+                       if (genconf)
+                           cmdcnf->expire_days = validate_expire(optarg, ch);
+                       else
+                           cmdcnf->expire_days = parse_date(now, optarg);
                        break;
                case 'p':
-                       now = time(NULL);
-                       cmdcnf->password_days = parse_date(now, optarg);
+                       if (genconf)
+                           cmdcnf->password_days = validate_expire(optarg, ch);
+                       else
+                           cmdcnf->password_days = parse_date(now, optarg);
                        break;
                case 'g':
                        validate_grname(cmdcnf, optarg);
@@ -1367,8 +1385,13 @@ pw_user_add(int argc, char **argv, char *arg1)
        pwd->pw_uid = pw_uidpolicy(cmdcnf, id);
        pwd->pw_gid = pw_gidpolicy(cnf, grname, pwd->pw_name,
            (gid_t) pwd->pw_uid, dryrun);
-       pwd->pw_change = cmdcnf->password_days;
-       pwd->pw_expire = cmdcnf->expire_days;
+
+       /* cmdcnf->password_days and cmdcnf->expire_days hold unixtime here */
+       if (cmdcnf->password_days > 0)
+               pwd->pw_change = cmdcnf->password_days;
+       if (cmdcnf->expire_days > 0)
+               pwd->pw_expire = cmdcnf->expire_days;
+
        pwd->pw_dir = pw_homepolicy(cmdcnf, homedir, pwd->pw_name);
        pwd->pw_shell = pw_shellpolicy(cmdcnf);
        lc = login_getpwclass(pwd);
@@ -1501,14 +1524,15 @@ pw_user_mod(int argc, char **argv, char *arg1)
        bool quiet, createhome, pretty, dryrun, nis, edited;
        bool precrypted;
        mode_t homemode = 0;
-       time_t expire_days, password_days, now;
+       time_t expire_time, password_time, now;
 
-       expire_days = password_days = -1;
+       expire_time = password_time = -1;
        gecos = homedir = grname = name = newname = skel = shell =NULL;
        passwd = NULL;
        class = nispasswd = NULL;
        quiet = createhome = pretty = dryrun = nis = precrypted = false;
        edited = false;
+       now = time(NULL);
 
        if (arg1 != NULL) {
                if (arg1[strspn(arg1, "0123456789")] == '\0')
@@ -1538,12 +1562,10 @@ pw_user_mod(int argc, char **argv, char *arg1)
                        homedir = optarg;
                        break;
                case 'e':
-                       now = time(NULL);
-                       expire_days = parse_date(now, optarg);
+                       expire_time = parse_date(now, optarg);
                        break;
                case 'p':
-                       now = time(NULL);
-                       password_days = parse_date(now, optarg);
+                       password_time = parse_date(now, optarg);
                        break;
                case 'g':
                        group_from_name_or_id(optarg);
@@ -1677,13 +1699,14 @@ pw_user_mod(int argc, char **argv, char *arg1)
                }
        }
 
-       if (password_days >= 0 && pwd->pw_change != password_days) {
-               pwd->pw_change = password_days;
+
+       if (password_time >= 0 && pwd->pw_change != password_time) {
+               pwd->pw_change = password_time;
                edited = true;
        }
 
-       if (expire_days >= 0 && pwd->pw_expire != expire_days) {
-               pwd->pw_expire = expire_days;
+       if (expire_time >= 0 && pwd->pw_expire != expire_time) {
+               pwd->pw_expire = expire_time;
                edited = true;
        }