]> git.cameronkatri.com Git - pw-darwin.git/blobdiff - pw/pw_user.c
git.ckatri.com / pw-darwin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use intmax_t rather than long long
[pw-darwin.git] / pw / pw_user.c
diff --git a/pw/pw_user.c b/pw/pw_user.c
index 0f7dd2691c996a57693d10ee7dc1a24a691e9631..33968ee138beae0fbcd0b7aa5efc22213b2b54f9 100644 (file)
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -30,1315 +30,1709 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
 #include <ctype.h>
 #include <ctype.h>
+#include <dirent.h>
 #include <err.h>
 #include <fcntl.h>
 #include <err.h>
 #include <fcntl.h>
-#include <sys/param.h>
-#include <dirent.h>
+#include <grp.h>
+#include <pwd.h>
+#include <libutil.h>
+#include <login_cap.h>
 #include <paths.h>
 #include <paths.h>
+#include <string.h>
+#include <sysexits.h>
 #include <termios.h>
 #include <termios.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 #include <unistd.h>
 #include <unistd.h>
-#include <login_cap.h>
-#include <pwd.h>
-#include <grp.h>
-#include <libutil.h>
+
 #include "pw.h"
 #include "bitmap.h"
 #include "pw.h"
 #include "bitmap.h"
+#include "psdate.h"
 
 #define LOGNAMESIZE (MAXLOGNAME-1)
 
 static         char locked_str[] = "*LOCKED*";
 
 
 #define LOGNAMESIZE (MAXLOGNAME-1)
 
 static         char locked_str[] = "*LOCKED*";
 
-static int      print_user(struct passwd * pwd, int pretty, int v7);
-static uid_t    pw_uidpolicy(struct userconf * cnf, struct cargs * args);
-static uid_t    pw_gidpolicy(struct userconf * cnf, struct cargs * args, char *nam, gid_t prefer);
-static time_t   pw_pwdpolicy(struct userconf * cnf, struct cargs * args);
-static time_t   pw_exppolicy(struct userconf * cnf, struct cargs * args);
-static char    *pw_homepolicy(struct userconf * cnf, struct cargs * args, char const * user);
-static char    *pw_shellpolicy(struct userconf * cnf, struct cargs * args, char *newshell);
-static char    *pw_password(struct userconf * cnf, struct cargs * args, char const * user);
-static char    *shell_path(char const * path, char *shells[], char *sh);
-static void     rmat(uid_t uid);
-static void     rmopie(char const * name);
+static struct passwd fakeuser = {
+       "nouser",
+       "*",
+       -1,
+       -1,
+       0,
+       "",
+       "User &",
+       "/nonexistent",
+       "/bin/sh",
+       0,
+       0
+};
+
+static int      print_user(struct passwd *pwd, bool pretty, bool v7);
+static uid_t    pw_uidpolicy(struct userconf *cnf, intmax_t id);
+static uid_t    pw_gidpolicy(struct userconf *cnf, char *grname, char *nam,
+    gid_t prefer, bool dryrun);
+static char    *pw_homepolicy(struct userconf * cnf, char *homedir,
+    const char *user);
+static char    *pw_shellpolicy(struct userconf * cnf);
+static char    *pw_password(struct userconf * cnf, char const * user,
+    bool dryrun);
+static char    *shell_path(char const * path, char *shells[], char *sh);
+static void    rmat(uid_t uid);
+static void    rmopie(char const * name);
 
 
-/*-
- * -C config      configuration file
- * -q             quiet operation
- * -n name        login name
- * -u uid         user id
- * -c comment     user name/comment
- * -d directory   home directory
- * -e date        account expiry date
- * -p date        password expiry date
- * -g grp         primary group
- * -G grp1,grp2   additional groups
- * -m [ -k dir ]  create and set up home
- * -s shell       name of login shell
- * -o             duplicate uid ok
- * -L class       user class
- * -l name        new login name
- * -h fd          password filehandle
- * -H fd          encrypted password filehandle
- * -F             force print or add
- *   Setting defaults:
- * -D             set user defaults
- * -b dir         default home root dir
- * -e period      default expiry period
- * -p period      default password change period
- * -g group       default group
- * -G             grp1,grp2.. default additional groups
- * -L class       default login class
- * -k dir         default home skeleton
- * -s shell       default shell
- * -w method      default password method
- */
-
-int
-pw_user(struct userconf * cnf, int mode, struct cargs * args)
+static void
+create_and_populate_homedir(struct userconf *cnf, struct passwd *pwd,
+    const char *skeldir, mode_t homemode, bool update)
 {
 {
-       int             rc, edited = 0;
-       char           *p = NULL;
-       char                                     *passtmp;
-       struct carg    *a_name;
-       struct carg    *a_uid;
-       struct carg    *arg;
-       struct passwd  *pwd = NULL;
-       struct group   *grp;
-       struct stat     st;
-       char            line[_PASSWORD_LEN+1];
-       FILE           *fp;
-       char *dmode_c;
-       void *set = NULL;
-
-       static struct passwd fakeuser =
-       {
-               NULL,
-               "*",
-               -1,
-               -1,
-               0,
-               "",
-               "User &",
-               "/nonexistent",
-               "/bin/sh",
-               0
-#if defined(__FreeBSD__)
-               ,0
-#endif
-       };
+       int skelfd = -1;
 
 
+       if (skeldir != NULL && *skeldir != '\0') {
+               if (*skeldir == '/')
+                       skeldir++;
+               skelfd = openat(conf.rootfd, skeldir, O_DIRECTORY|O_CLOEXEC);
+       }
 
 
-       /*
-        * With M_NEXT, we only need to return the
-        * next uid to stdout
-        */
-       if (mode == M_NEXT)
-       {
-               uid_t next = pw_uidpolicy(cnf, args);
-               if (getarg(args, 'q'))
-                       return next;
-               printf("%ld:", (long)next);
-               pw_group(cnf, mode, args);
-               return EXIT_SUCCESS;
+       copymkdir(conf.rootfd, pwd->pw_dir, skelfd, homemode, pwd->pw_uid,
+           pwd->pw_gid, 0);
+       pw_log(cnf, update ? M_UPDATE : M_ADD, W_USER, "%s(%ju) home %s made",
+           pwd->pw_name, (uintmax_t)pwd->pw_uid, pwd->pw_dir);
+}
+
+static int
+pw_set_passwd(struct passwd *pwd, int fd, bool precrypted, bool update)
+{
+       int              b, istty;
+       struct termios   t, n;
+       login_cap_t     *lc;
+       char            line[_PASSWORD_LEN+1];
+       char            *p;
+
+       if (fd == '-') {
+               if (!pwd->pw_passwd || *pwd->pw_passwd != '*') {
+                       pwd->pw_passwd = "*";   /* No access */
+                       return (1);
+               }
+               return (0);
        }
 
        }
 
-       /*
-        * We can do all of the common legwork here
-        */
+       if ((istty = isatty(fd))) {
+               if (tcgetattr(fd, &t) == -1)
+                       istty = 0;
+               else {
+                       n = t;
+                       n.c_lflag &= ~(ECHO);
+                       tcsetattr(fd, TCSANOW, &n);
+                       printf("%s%spassword for user %s:",
+                           update ? "new " : "",
+                           precrypted ? "encrypted " : "",
+                           pwd->pw_name);
+                       fflush(stdout);
+               }
+       }
+       b = read(fd, line, sizeof(line) - 1);
+       if (istty) {    /* Restore state */
+               tcsetattr(fd, TCSANOW, &t);
+               fputc('\n', stdout);
+               fflush(stdout);
+       }
 
 
-       if ((arg = getarg(args, 'b')) != NULL) {
-               cnf->home = arg->val;
+       if (b < 0)
+               err(EX_IOERR, "-%c file descriptor",
+                   precrypted ? 'H' : 'h');
+       line[b] = '\0';
+       if ((p = strpbrk(line, "\r\n")) != NULL)
+               *p = '\0';
+       if (!*line)
+               errx(EX_DATAERR, "empty password read on file descriptor %d",
+                   fd);
+       if (precrypted) {
+               if (strchr(line, ':') != NULL)
+                       errx(EX_DATAERR, "bad encrypted password");
+               pwd->pw_passwd = strdup(line);
+       } else {
+               lc = login_getpwclass(pwd);
+               if (lc == NULL ||
+                               login_setcryptfmt(lc, "sha512", NULL) == NULL)
+                       warn("setting crypt(3) format");
+               login_close(lc);
+               pwd->pw_passwd = pw_pwcrypt(line);
        }
        }
+       return (1);
+}
 
 
-       if ((arg = getarg(args, 'M')) != NULL) {
-               dmode_c = arg->val;
-               if ((set = setmode(dmode_c)) == NULL)
-                       errx(EX_DATAERR, "invalid directory creation mode '%s'",
-                           dmode_c);
-               cnf->homemode = getmode(set, _DEF_DIRMODE);
-               free(set);
+static void
+perform_chgpwent(const char *name, struct passwd *pwd, char *nispasswd)
+{
+       int rc;
+       struct passwd *nispwd;
+
+       /* duplicate for nis so that chgpwent is not modifying before NIS */
+       if (nispasswd && *nispasswd == '/')
+               nispwd = pw_dup(pwd);
+
+       rc = chgpwent(name, pwd);
+       if (rc == -1)
+               errx(EX_IOERR, "user '%s' does not exist (NIS?)", pwd->pw_name);
+       else if (rc != 0)
+               err(EX_IOERR, "passwd file update");
+
+       if (nispasswd && *nispasswd == '/') {
+               rc = chgnispwent(nispasswd, name, nispwd);
+               if (rc == -1)
+                       warn("User '%s' not found in NIS passwd", pwd->pw_name);
+               else if (rc != 0)
+                       warn("NIS passwd update");
+               /* NOTE: NIS-only update errors are not fatal */
        }
        }
+}
 
 
-       /*
-        * If we'll need to use it or we're updating it,
-        * then create the base home directory if necessary
-        */
-       if (arg != NULL || getarg(args, 'm') != NULL) {
-               int     l = strlen(cnf->home);
+/*
+ * The M_LOCK and M_UNLOCK functions simply add or remove
+ * a "*LOCKED*" prefix from in front of the password to
+ * prevent it decoding correctly, and therefore prevents
+ * access. Of course, this only prevents access via
+ * password authentication (not ssh, kerberos or any
+ * other method that does not use the UNIX password) but
+ * that is a known limitation.
+ */
+static int
+pw_userlock(char *arg1, int mode)
+{
+       struct passwd *pwd = NULL;
+       char *passtmp = NULL;
+       char *name;
+       bool locked = false;
+       uid_t id;
 
 
-               if (l > 1 && cnf->home[l-1] == '/')     /* Shave off any trailing path delimiter */
-                       cnf->home[--l] = '\0';
+       if (geteuid() != 0)
+               errx(EX_NOPERM, "you must be root");
 
 
-               if (l < 2 || *cnf->home != '/')         /* Check for absolute path name */
-                       errx(EX_DATAERR, "invalid base directory for home '%s'", cnf->home);
+       if (arg1 == NULL)
+               errx(EX_DATAERR, "username or id required");
 
 
-               if (stat(cnf->home, &st) == -1) {
-                       char    dbuf[MAXPATHLEN];
+       if (strspn(arg1, "0123456789") == strlen(arg1))
+               id = pw_checkid(arg1, UID_MAX);
+       else
+               name = arg1;
 
 
-                       /*
-                        * This is a kludge especially for Joerg :)
-                        * If the home directory would be created in the root partition, then
-                        * we really create it under /usr which is likely to have more space.
-                        * But we create a symlink from cnf->home -> "/usr" -> cnf->home
-                        */
-                       if (strchr(cnf->home+1, '/') == NULL) {
-                               snprintf(dbuf, MAXPATHLEN, "/usr%s", cnf->home);
-                               if (mkdir(dbuf, _DEF_DIRMODE) != -1 || errno == EEXIST) {
-                                       chown(dbuf, 0, 0);
-                                       /*
-                                        * Skip first "/" and create symlink:
-                                        * /home -> usr/home
-                                        */
-                                       symlink(dbuf+1, cnf->home);
-                               }
-                               /* If this falls, fall back to old method */
-                       }
-                       strlcpy(dbuf, cnf->home, sizeof(dbuf));
-                       p = dbuf;
-                       if (stat(dbuf, &st) == -1) {
-                               while ((p = strchr(p + 1, '/')) != NULL) {
-                                       *p = '\0';
-                                       if (stat(dbuf, &st) == -1) {
-                                               if (mkdir(dbuf, _DEF_DIRMODE) == -1)
-                                                       goto direrr;
-                                               chown(dbuf, 0, 0);
-                                       } else if (!S_ISDIR(st.st_mode))
-                                               errx(EX_OSFILE, "'%s' (root home parent) is not a directory", dbuf);
-                                       *p = '/';
-                               }
-                       }
-                       if (stat(dbuf, &st) == -1) {
-                               if (mkdir(dbuf, _DEF_DIRMODE) == -1) {
-                               direrr: err(EX_OSFILE, "mkdir '%s'", dbuf);
-                               }
-                               chown(dbuf, 0, 0);
-                       }
-               } else if (!S_ISDIR(st.st_mode))
-                       errx(EX_OSFILE, "root home `%s' is not a directory", cnf->home);
+       pwd = (name != NULL) ? GETPWNAM(pw_checkname(name, 0)) : GETPWUID(id);
+       if (pwd == NULL) {
+               if (name == NULL)
+                       errx(EX_NOUSER, "no such uid `%ju'", (uintmax_t) id);
+               errx(EX_NOUSER, "no such user `%s'", name);
        }
 
        }
 
-       if ((arg = getarg(args, 'e')) != NULL)
-               cnf->expire_days = atoi(arg->val);
+       if (name == NULL)
+               name = pwd->pw_name;
+
+       if (strncmp(pwd->pw_passwd, locked_str, sizeof(locked_str) -1) == 0)
+               locked = true;
+       if (mode == M_LOCK && locked)
+               errx(EX_DATAERR, "user '%s' is already locked", pwd->pw_name);
+       if (mode == M_UNLOCK && !locked)
+               errx(EX_DATAERR, "user '%s' is not locked", pwd->pw_name);
+
+       if (mode == M_LOCK) {
+               asprintf(&passtmp, "%s%s", locked_str, pwd->pw_passwd);
+               if (passtmp == NULL)    /* disaster */
+                       errx(EX_UNAVAILABLE, "out of memory");
+               pwd->pw_passwd = passtmp;
+       } else {
+               pwd->pw_passwd += sizeof(locked_str)-1;
+       }
 
 
-       if ((arg = getarg(args, 'y')) != NULL)
-               cnf->nispasswd = arg->val;
+       perform_chgpwent(name, pwd, NULL);
+       free(passtmp);
 
 
-       if ((arg = getarg(args, 'p')) != NULL && arg->val)
-               cnf->password_days = atoi(arg->val);
+       return (EXIT_SUCCESS);
+}
 
 
-       if ((arg = getarg(args, 'g')) != NULL) {
-               if (!*(p = arg->val))   /* Handle empty group list specially */
-                       cnf->default_group = "";
-               else {
-                       if ((grp = GETGRNAM(p)) == NULL) {
-                               if (!isdigit((unsigned char)*p) || (grp = GETGRGID((gid_t) atoi(p))) == NULL)
-                                       errx(EX_NOUSER, "group `%s' does not exist", p);
-                       }
-                       cnf->default_group = newstr(grp->gr_name);
-               }
-       }
-       if ((arg = getarg(args, 'L')) != NULL)
-               cnf->default_class = pw_checkname((u_char *)arg->val, 0);
+static uid_t
+pw_uidpolicy(struct userconf * cnf, intmax_t id)
+{
+       struct passwd  *pwd;
+       struct bitmap   bm;
+       uid_t           uid = (uid_t) - 1;
 
 
-       if ((arg = getarg(args, 'G')) != NULL && arg->val) {
-               int i = 0;
+       /*
+        * Check the given uid, if any
+        */
+       if (id >= 0) {
+               uid = (uid_t) id;
 
 
-               for (p = strtok(arg->val, ", \t"); p != NULL; p = strtok(NULL, ", \t")) {
-                       if ((grp = GETGRNAM(p)) == NULL) {
-                               if (!isdigit((unsigned char)*p) || (grp = GETGRGID((gid_t) atoi(p))) == NULL)
-                                       errx(EX_NOUSER, "group `%s' does not exist", p);
-                       }
-                       if (extendarray(&cnf->groups, &cnf->numgroups, i + 2) != -1)
-                               cnf->groups[i++] = newstr(grp->gr_name);
-               }
-               while (i < cnf->numgroups)
-                       cnf->groups[i++] = NULL;
+               if ((pwd = GETPWUID(uid)) != NULL && conf.checkduplicate)
+                       errx(EX_DATAERR, "uid `%ju' has already been allocated",
+                           (uintmax_t)pwd->pw_uid);
+               return (uid);
        }
        }
-
-       if ((arg = getarg(args, 'k')) != NULL) {
-               if (stat(cnf->dotdir = arg->val, &st) == -1 || !S_ISDIR(st.st_mode))
-                       errx(EX_OSFILE, "skeleton `%s' is not a directory or does not exist", cnf->dotdir);
+       /*
+        * We need to allocate the next available uid under one of
+        * two policies a) Grab the first unused uid b) Grab the
+        * highest possible unused uid
+        */
+       if (cnf->min_uid >= cnf->max_uid) {     /* Sanity
+                                                * claus^H^H^H^Hheck */
+               cnf->min_uid = 1000;
+               cnf->max_uid = 32000;
        }
        }
+       bm = bm_alloc(cnf->max_uid - cnf->min_uid + 1);
 
 
-       if ((arg = getarg(args, 's')) != NULL)
-               cnf->shell_default = arg->val;
-
-       if ((arg = getarg(args, 'w')) != NULL)
-               cnf->default_password = boolean_val(arg->val, cnf->default_password);
-       if (mode == M_ADD && getarg(args, 'D')) {
-               if (getarg(args, 'n') != NULL)
-                       errx(EX_DATAERR, "can't combine `-D' with `-n name'");
-               if ((arg = getarg(args, 'u')) != NULL && (p = strtok(arg->val, ", \t")) != NULL) {
-                       if ((cnf->min_uid = (uid_t) atoi(p)) == 0)
-                               cnf->min_uid = 1000;
-                       if ((p = strtok(NULL, " ,\t")) == NULL || (cnf->max_uid = (uid_t) atoi(p)) < cnf->min_uid)
-                               cnf->max_uid = 32000;
-               }
-               if ((arg = getarg(args, 'i')) != NULL && (p = strtok(arg->val, ", \t")) != NULL) {
-                       if ((cnf->min_gid = (gid_t) atoi(p)) == 0)
-                               cnf->min_gid = 1000;
-                       if ((p = strtok(NULL, " ,\t")) == NULL || (cnf->max_gid = (gid_t) atoi(p)) < cnf->min_gid)
-                               cnf->max_gid = 32000;
-               }
+       /*
+        * Now, let's fill the bitmap from the password file
+        */
+       SETPWENT();
+       while ((pwd = GETPWENT()) != NULL)
+               if (pwd->pw_uid >= (uid_t) cnf->min_uid && pwd->pw_uid <= (uid_t) cnf->max_uid)
+                       bm_setbit(&bm, pwd->pw_uid - cnf->min_uid);
+       ENDPWENT();
 
 
-               arg = getarg(args, 'C');
-               if (write_userconfig(arg ? arg->val : NULL))
-                       return EXIT_SUCCESS;
-               warn("config update");
-               return EX_IOERR;
-       }
+       /*
+        * Then apply the policy, with fallback to reuse if necessary
+        */
+       if (cnf->reuse_uids || (uid = (uid_t) (bm_lastset(&bm) + cnf->min_uid + 1)) > cnf->max_uid)
+               uid = (uid_t) (bm_firstunset(&bm) + cnf->min_uid);
 
 
-       if (mode == M_PRINT && getarg(args, 'a')) {
-               int             pretty = getarg(args, 'P') != NULL;
-               int             v7 = getarg(args, '7') != NULL;
-               SETPWENT();
-               while ((pwd = GETPWENT()) != NULL)
-                       print_user(pwd, pretty, v7);
-               ENDPWENT();
-               return EXIT_SUCCESS;
-       }
+       /*
+        * Another sanity check
+        */
+       if (uid < cnf->min_uid || uid > cnf->max_uid)
+               errx(EX_SOFTWARE, "unable to allocate a new uid - range fully used");
+       bm_dealloc(&bm);
+       return (uid);
+}
 
 
-       if ((a_name = getarg(args, 'n')) != NULL)
-               pwd = GETPWNAM(pw_checkname((u_char *)a_name->val, 0));
-       a_uid = getarg(args, 'u');
+static uid_t
+pw_gidpolicy(struct userconf *cnf, char *grname, char *nam, gid_t prefer, bool dryrun)
+{
+       struct group   *grp;
+       gid_t           gid = (uid_t) - 1;
 
 
-       if (a_uid == NULL) {
-               if (a_name == NULL)
-                       errx(EX_DATAERR, "user name or id required");
+       /*
+        * Check the given gid, if any
+        */
+       SETGRENT();
+       if (grname) {
+               if ((grp = GETGRNAM(grname)) == NULL) {
+                       gid = pw_checkid(grname, GID_MAX);
+                       grp = GETGRGID(gid);
+               }
+               gid = grp->gr_gid;
+       } else if ((grp = GETGRNAM(nam)) != NULL &&
+           (grp->gr_mem == NULL || grp->gr_mem[0] == NULL)) {
+               gid = grp->gr_gid;  /* Already created? Use it anyway... */
+       } else {
+               intmax_t                grid = -1;
 
                /*
 
                /*
-                * Determine whether 'n' switch is name or uid - we don't
-                * really don't really care which we have, but we need to
-                * know.
+                * We need to auto-create a group with the user's name. We
+                * can send all the appropriate output to our sister routine
+                * bit first see if we can create a group with gid==uid so we
+                * can keep the user and group ids in sync. We purposely do
+                * NOT check the gid range if we can force the sync. If the
+                * user's name dups an existing group, then the group add
+                * function will happily handle that case for us and exit.
                 */
                 */
-               if (mode != M_ADD && pwd == NULL
-                   && strspn(a_name->val, "0123456789") == strlen(a_name->val)
-                   && *a_name->val) {
-                       (a_uid = a_name)->ch = 'u';
-                       a_name = NULL;
+               if (GETGRGID(prefer) == NULL)
+                       grid = prefer;
+               if (dryrun) {
+                       gid = pw_groupnext(cnf, true);
+               } else {
+                       if (grid == -1)
+                               grid =  pw_groupnext(cnf, true);
+                       groupadd(cnf, nam, grid, NULL, -1, false, false, false);
+                       if ((grp = GETGRNAM(nam)) != NULL)
+                               gid = grp->gr_gid;
                }
                }
-       } else {
-               if (strspn(a_uid->val, "0123456789") != strlen(a_uid->val))
-                       errx(EX_USAGE, "-u expects a number");
        }
        }
+       ENDGRENT();
+       return (gid);
+}
 
 
-       /*
-        * Update, delete & print require that the user exists
-        */
-       if (mode == M_UPDATE || mode == M_DELETE ||
-           mode == M_PRINT  || mode == M_LOCK   || mode == M_UNLOCK) {
-
-               if (a_name == NULL && pwd == NULL)      /* Try harder */
-                       pwd = GETPWUID(atoi(a_uid->val));
-
-               if (pwd == NULL) {
-                       if (mode == M_PRINT && getarg(args, 'F')) {
-                               fakeuser.pw_name = a_name ? a_name->val : "nouser";
-                               fakeuser.pw_uid = a_uid ? (uid_t) atol(a_uid->val) : -1;
-                               return print_user(&fakeuser,
-                                                 getarg(args, 'P') != NULL,
-                                                 getarg(args, '7') != NULL);
-                       }
-                       if (a_name == NULL)
-                               errx(EX_NOUSER, "no such uid `%s'", a_uid->val);
-                       errx(EX_NOUSER, "no such user `%s'", a_name->val);
-               }
-
-               if (a_name == NULL)     /* May be needed later */
-                       a_name = addarg(args, 'n', newstr(pwd->pw_name));
+static char *
+pw_homepolicy(struct userconf * cnf, char *homedir, const char *user)
+{
+       static char     home[128];
 
 
-               /*
-                * The M_LOCK and M_UNLOCK functions simply add or remove
-                * a "*LOCKED*" prefix from in front of the password to
-                * prevent it decoding correctly, and therefore prevents
-                * access. Of course, this only prevents access via
-                * password authentication (not ssh, kerberos or any
-                * other method that does not use the UNIX password) but
-                * that is a known limitation.
-                */
+       if (homedir)
+               return (homedir);
 
 
-               if (mode == M_LOCK) {
-                       if (strncmp(pwd->pw_passwd, locked_str, sizeof(locked_str)-1) == 0)
-                               errx(EX_DATAERR, "user '%s' is already locked", pwd->pw_name);
-                       passtmp = malloc(strlen(pwd->pw_passwd) + sizeof(locked_str));
-                       if (passtmp == NULL)    /* disaster */
-                               errx(EX_UNAVAILABLE, "out of memory");
-                       strcpy(passtmp, locked_str);
-                       strcat(passtmp, pwd->pw_passwd);
-                       pwd->pw_passwd = passtmp;
-                       edited = 1;
-               } else if (mode == M_UNLOCK) {
-                       if (strncmp(pwd->pw_passwd, locked_str, sizeof(locked_str)-1) != 0)
-                               errx(EX_DATAERR, "user '%s' is not locked", pwd->pw_name);
-                       pwd->pw_passwd += sizeof(locked_str)-1;
-                       edited = 1;
-               } else if (mode == M_DELETE) {
-                       /*
-                        * Handle deletions now
-                        */
-                       char            file[MAXPATHLEN];
-                       char            home[MAXPATHLEN];
-                       uid_t           uid = pwd->pw_uid;
-                       struct group    *gr;
-                       char            grname[LOGNAMESIZE];
-
-                       if (strcmp(pwd->pw_name, "root") == 0)
-                               errx(EX_DATAERR, "cannot remove user 'root'");
-
-                       if (!PWALTDIR()) {
-                               /*
-                                * Remove opie record from /etc/opiekeys
-                                */
-
-                               rmopie(pwd->pw_name);
-
-                               /*
-                                * Remove crontabs
-                                */
-                               snprintf(file, sizeof(file), "/var/cron/tabs/%s", pwd->pw_name);
-                               if (access(file, F_OK) == 0) {
-                                       sprintf(file, "crontab -u %s -r", pwd->pw_name);
-                                       system(file);
-                               }
-                       }
-                       /*
-                        * Save these for later, since contents of pwd may be
-                        * invalidated by deletion
-                        */
-                       sprintf(file, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
-                       strlcpy(home, pwd->pw_dir, sizeof(home));
-                       gr = GETGRGID(pwd->pw_gid);
-                       if (gr != NULL)
-                               strlcpy(grname, gr->gr_name, LOGNAMESIZE);
-                       else
-                               grname[0] = '\0';
-
-                       rc = delpwent(pwd);
-                       if (rc == -1)
-                               err(EX_IOERR, "user '%s' does not exist", pwd->pw_name);
-                       else if (rc != 0) {
-                               warn("passwd update");
-                               return EX_IOERR;
-                       }
+       if (cnf->home == NULL || *cnf->home == '\0')
+               errx(EX_CONFIG, "no base home directory set");
+       snprintf(home, sizeof(home), "%s/%s", cnf->home, user);
 
 
-                       if (cnf->nispasswd && *cnf->nispasswd=='/') {
-                               rc = delnispwent(cnf->nispasswd, a_name->val);
-                               if (rc == -1)
-                                       warnx("WARNING: user '%s' does not exist in NIS passwd", pwd->pw_name);
-                               else if (rc != 0)
-                                       warn("WARNING: NIS passwd update");
-                               /* non-fatal */
-                       }
+       return (home);
+}
 
 
-                       grp = GETGRNAM(a_name->val);
-                       if (grp != NULL &&
-                           (grp->gr_mem == NULL || *grp->gr_mem == NULL) &&
-                           strcmp(a_name->val, grname) == 0)
-                               delgrent(GETGRNAM(a_name->val));
-                       SETGRENT();
-                       while ((grp = GETGRENT()) != NULL) {
-                               int i, j;
-                               char group[MAXLOGNAME];
-                               if (grp->gr_mem != NULL) {
-                                       for (i = 0; grp->gr_mem[i] != NULL; i++) {
-                                               if (!strcmp(grp->gr_mem[i], a_name->val)) {
-                                                       for (j = i; grp->gr_mem[j] != NULL; j++)
-                                                               grp->gr_mem[j] = grp->gr_mem[j+1];
-                                                       strlcpy(group, grp->gr_name, MAXLOGNAME);
-                                                       chggrent(group, grp);
-                                               }
-                                       }
-                               }
-                       }
-                       ENDGRENT();
-
-                       pw_log(cnf, mode, W_USER, "%s(%ld) account removed", a_name->val, (long) uid);
-
-                       if (!PWALTDIR()) {
-                               /*
-                                * Remove mail file
-                                */
-                               remove(file);
-
-                               /*
-                                * Remove at jobs
-                                */
-                               if (getpwuid(uid) == NULL)
-                                       rmat(uid);
-
-                               /*
-                                * Remove home directory and contents
-                                */
-                               if (getarg(args, 'r') != NULL && *home == '/' && getpwuid(uid) == NULL) {
-                                       if (stat(home, &st) != -1) {
-                                               rm_r(home, uid);
-                                               pw_log(cnf, mode, W_USER, "%s(%ld) home '%s' %sremoved",
-                                                      a_name->val, (long) uid, home,
-                                                      stat(home, &st) == -1 ? "" : "not completely ");
-                                       }
-                               }
-                       }
-                       return EXIT_SUCCESS;
-               } else if (mode == M_PRINT)
-                       return print_user(pwd,
-                                         getarg(args, 'P') != NULL,
-                                         getarg(args, '7') != NULL);
+static char *
+shell_path(char const * path, char *shells[], char *sh)
+{
+       if (sh != NULL && (*sh == '/' || *sh == '\0'))
+               return sh;      /* specified full path or forced none */
+       else {
+               char           *p;
+               char            paths[_UC_MAXLINE];
 
                /*
 
                /*
-                * The rest is edit code
+                * We need to search paths
                 */
                 */
-               if ((arg = getarg(args, 'l')) != NULL) {
-                       if (strcmp(pwd->pw_name, "root") == 0)
-                               errx(EX_DATAERR, "can't rename `root' account");
-                       pwd->pw_name = pw_checkname((u_char *)arg->val, 0);
-                       edited = 1;
-               }
-
-               if ((arg = getarg(args, 'u')) != NULL && isdigit((unsigned char)*arg->val)) {
-                       pwd->pw_uid = (uid_t) atol(arg->val);
-                       edited = 1;
-                       if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)
-                               errx(EX_DATAERR, "can't change uid of `root' account");
-                       if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
-                               warnx("WARNING: account `%s' will have a uid of 0 (superuser access!)", pwd->pw_name);
-               }
+               strlcpy(paths, path, sizeof(paths));
+               for (p = strtok(paths, ": \t\r\n"); p != NULL; p = strtok(NULL, ": \t\r\n")) {
+                       int             i;
+                       static char     shellpath[256];
 
 
-               if ((arg = getarg(args, 'g')) != NULL && pwd->pw_uid != 0) {    /* Already checked this */
-                       gid_t newgid = (gid_t) GETGRNAM(cnf->default_group)->gr_gid;
-                       if (newgid != pwd->pw_gid) {
-                               edited = 1;
-                               pwd->pw_gid = newgid;
-                       }
+                       if (sh != NULL) {
+                               snprintf(shellpath, sizeof(shellpath), "%s/%s", p, sh);
+                               if (access(shellpath, X_OK) == 0)
+                                       return shellpath;
+                       } else
+                               for (i = 0; i < _UC_MAXSHELLS && shells[i] != NULL; i++) {
+                                       snprintf(shellpath, sizeof(shellpath), "%s/%s", p, shells[i]);
+                                       if (access(shellpath, X_OK) == 0)
+                                               return shellpath;
+                               }
                }
                }
+               if (sh == NULL)
+                       errx(EX_OSFILE, "can't find shell `%s' in shell paths", sh);
+               errx(EX_CONFIG, "no default shell available or defined");
+               return NULL;
+       }
+}
 
 
-               if ((arg = getarg(args, 'p')) != NULL) {
-                       if (*arg->val == '\0' || strcmp(arg->val, "0") == 0) {
-                               if (pwd->pw_change != 0) {
-                                       pwd->pw_change = 0;
-                                       edited = 1;
-                               }
-                       }
-                       else {
-                               time_t          now = time(NULL);
-                               time_t          expire = parse_date(now, arg->val);
+static char *
+pw_shellpolicy(struct userconf * cnf)
+{
 
 
-                               if (pwd->pw_change != expire) {
-                                       pwd->pw_change = expire;
-                                       edited = 1;
-                               }
-                       }
-               }
+       return shell_path(cnf->shelldir, cnf->shells, cnf->shell_default);
+}
 
 
-               if ((arg = getarg(args, 'e')) != NULL) {
-                       if (*arg->val == '\0' || strcmp(arg->val, "0") == 0) {
-                               if (pwd->pw_expire != 0) {
-                                       pwd->pw_expire = 0;
-                                       edited = 1;
-                               }
-                       }
-                       else {
-                               time_t          now = time(NULL);
-                               time_t          expire = parse_date(now, arg->val);
+#define        SALTSIZE        32
 
 
-                               if (pwd->pw_expire != expire) {
-                                       pwd->pw_expire = expire;
-                                       edited = 1;
-                               }
-                       }
-               }
+static char const chars[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ./";
 
 
-               if ((arg = getarg(args, 's')) != NULL) {
-                       char *shell = shell_path(cnf->shelldir, cnf->shells, arg->val);
-                       if (shell == NULL)
-                               shell = "";
-                       if (strcmp(shell, pwd->pw_shell) != 0) {
-                               pwd->pw_shell = shell;
-                               edited = 1;
-                       }
-               }
+char *
+pw_pwcrypt(char *password)
+{
+       int             i;
+       char            salt[SALTSIZE + 1];
+       char            *cryptpw;
+       static char     buf[256];
 
 
-               if (getarg(args, 'L')) {
-                       if (cnf->default_class == NULL)
-                               cnf->default_class = "";
-                       if (strcmp(pwd->pw_class, cnf->default_class) != 0) {
-                               pwd->pw_class = cnf->default_class;
-                               edited = 1;
-                       }
-               }
+       /*
+        * Calculate a salt value
+        */
+       for (i = 0; i < SALTSIZE; i++)
+               salt[i] = chars[arc4random_uniform(sizeof(chars) - 1)];
+       salt[SALTSIZE] = '\0';
 
 
-               if ((arg  = getarg(args, 'd')) != NULL) {
-                       if (strcmp(pwd->pw_dir, arg->val))
-                               edited = 1;
-                       if (stat(pwd->pw_dir = arg->val, &st) == -1) {
-                               if (getarg(args, 'm') == NULL && strcmp(pwd->pw_dir, "/nonexistent") != 0)
-                                 warnx("WARNING: home `%s' does not exist", pwd->pw_dir);
-                       } else if (!S_ISDIR(st.st_mode))
-                               warnx("WARNING: home `%s' is not a directory", pwd->pw_dir);
-               }
+       cryptpw = crypt(password, salt);
+       if (cryptpw == NULL)
+               errx(EX_CONFIG, "crypt(3) failure");
+       return strcpy(buf, cryptpw);
+}
 
 
-               if ((arg = getarg(args, 'w')) != NULL &&
-                   getarg(args, 'h') == NULL && getarg(args, 'H') == NULL) {
-                       login_cap_t *lc;
-
-                       lc = login_getpwclass(pwd);
-                       if (lc == NULL ||
-                           login_setcryptfmt(lc, "sha512", NULL) == NULL)
-                               warn("setting crypt(3) format");
-                       login_close(lc);
-                       pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);
-                       edited = 1;
-               }
+static char *
+pw_password(struct userconf * cnf, char const * user, bool dryrun)
+{
+       int             i, l;
+       char            pwbuf[32];
 
 
-       } else {
-               login_cap_t *lc;
+       switch (cnf->default_password) {
+       case -1:                /* Random password */
+               l = (arc4random() % 8 + 8);     /* 8 - 16 chars */
+               for (i = 0; i < l; i++)
+                       pwbuf[i] = chars[arc4random_uniform(sizeof(chars)-1)];
+               pwbuf[i] = '\0';
 
                /*
 
                /*
-                * Add code
+                * We give this information back to the user
                 */
                 */
+               if (conf.fd == -1 && !dryrun) {
+                       if (isatty(STDOUT_FILENO))
+                               printf("Password for '%s' is: ", user);
+                       printf("%s\n", pwbuf);
+                       fflush(stdout);
+               }
+               break;
 
 
-               if (a_name == NULL)     /* Required */
-                       errx(EX_DATAERR, "login name required");
-               else if ((pwd = GETPWNAM(a_name->val)) != NULL) /* Exists */
-                       errx(EX_DATAERR, "login name `%s' already exists", a_name->val);
+       case -2:                /* No password at all! */
+               return "";
 
 
-               /*
-                * Now, set up defaults for a new user
-                */
-               pwd = &fakeuser;
-               pwd->pw_name = a_name->val;
-               pwd->pw_class = cnf->default_class ? cnf->default_class : "";
-               pwd->pw_uid = pw_uidpolicy(cnf, args);
-               pwd->pw_gid = pw_gidpolicy(cnf, args, pwd->pw_name, (gid_t) pwd->pw_uid);
-               pwd->pw_change = pw_pwdpolicy(cnf, args);
-               pwd->pw_expire = pw_exppolicy(cnf, args);
-               pwd->pw_dir = pw_homepolicy(cnf, args, pwd->pw_name);
-               pwd->pw_shell = pw_shellpolicy(cnf, args, NULL);
-               lc = login_getpwclass(pwd);
-               if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
-                       warn("setting crypt(3) format");
-               login_close(lc);
-               pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);
-               edited = 1;
+       case 0:         /* No login - default */
+       default:
+               return "*";
 
 
-               if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
-                       warnx("WARNING: new account `%s' has a uid of 0 (superuser access!)", pwd->pw_name);
+       case 1:         /* user's name */
+               strlcpy(pwbuf, user, sizeof(pwbuf));
+               break;
        }
        }
+       return pw_pwcrypt(pwbuf);
+}
 
 
-       /*
-        * Shared add/edit code
-        */
-       if ((arg = getarg(args, 'c')) != NULL) {
-               char    *gecos = pw_checkname((u_char *)arg->val, 1);
-               if (strcmp(pwd->pw_gecos, gecos) != 0) {
-                       pwd->pw_gecos = gecos;
-                       edited = 1;
-               }
+static int
+print_user(struct passwd * pwd, bool pretty, bool v7)
+{
+       int             j;
+       char           *p;
+       struct group   *grp = GETGRGID(pwd->pw_gid);
+       char            uname[60] = "User &", office[60] = "[None]",
+                       wphone[60] = "[None]", hphone[60] = "[None]";
+       char            acexpire[32] = "[None]", pwexpire[32] = "[None]";
+       struct tm *    tptr;
+
+       if (!pretty) {
+               p = v7 ? pw_make_v7(pwd) : pw_make(pwd);
+               printf("%s\n", p);
+               free(p);
+               return (EXIT_SUCCESS);
        }
 
        }
 
-       if ((arg = getarg(args, 'h')) != NULL ||
-           (arg = getarg(args, 'H')) != NULL) {
-               if (strcmp(arg->val, "-") == 0) {
-                       if (!pwd->pw_passwd || *pwd->pw_passwd != '*') {
-                               pwd->pw_passwd = "*";   /* No access */
-                               edited = 1;
+       if ((p = strtok(pwd->pw_gecos, ",")) != NULL) {
+               strlcpy(uname, p, sizeof(uname));
+               if ((p = strtok(NULL, ",")) != NULL) {
+                       strlcpy(office, p, sizeof(office));
+                       if ((p = strtok(NULL, ",")) != NULL) {
+                               strlcpy(wphone, p, sizeof(wphone));
+                               if ((p = strtok(NULL, "")) != NULL) {
+                                       strlcpy(hphone, p, sizeof(hphone));
+                               }
                        }
                        }
-               } else {
-                       int             fd = atoi(arg->val);
-                       int             precrypt = (arg->ch == 'H');
-                       int             b;
-                       int             istty = isatty(fd);
-                       struct termios  t;
-                       login_cap_t     *lc;
-
-                       if (istty) {
-                               if (tcgetattr(fd, &t) == -1)
-                                       istty = 0;
-                               else {
-                                       struct termios  n = t;
-
-                                       /* Disable echo */
-                                       n.c_lflag &= ~(ECHO);
-                                       tcsetattr(fd, TCSANOW, &n);
-                                       printf("%s%spassword for user %s:",
-                                            (mode == M_UPDATE) ? "new " : "",
-                                            precrypt ? "encrypted " : "",
-                                            pwd->pw_name);
-                                       fflush(stdout);
-                               }
-                       }
-                       b = read(fd, line, sizeof(line) - 1);
-                       if (istty) {    /* Restore state */
-                               tcsetattr(fd, TCSANOW, &t);
-                               fputc('\n', stdout);
-                               fflush(stdout);
-                       }
-                       if (b < 0) {
-                               warn("-%c file descriptor", precrypt ? 'H' :
-                                   'h');
-                               return EX_IOERR;
-                       }
-                       line[b] = '\0';
-                       if ((p = strpbrk(line, "\r\n")) != NULL)
-                               *p = '\0';
-                       if (!*line)
-                               errx(EX_DATAERR, "empty password read on file descriptor %d", fd);
-                       if (precrypt) {
-                               if (strchr(line, ':') != NULL)
-                                       return EX_DATAERR;
-                               pwd->pw_passwd = line;
-                       } else {
-                               lc = login_getpwclass(pwd);
-                               if (lc == NULL ||
-                                   login_setcryptfmt(lc, "sha512", NULL) == NULL)
-                                       warn("setting crypt(3) format");
-                               login_close(lc);
-                               pwd->pw_passwd = pw_pwcrypt(line);
-                       }
-                       edited = 1;
                }
        }
                }
        }
-
        /*
        /*
-        * Special case: -N only displays & exits
+        * Handle '&' in gecos field
         */
         */
-       if (getarg(args, 'N') != NULL)
-               return print_user(pwd,
-                                 getarg(args, 'P') != NULL,
-                                 getarg(args, '7') != NULL);
-
-       if (mode == M_ADD) {
-               edited = 1;     /* Always */
-               rc = addpwent(pwd);
-               if (rc == -1) {
-                       warnx("user '%s' already exists", pwd->pw_name);
-                       return EX_IOERR;
-               } else if (rc != 0) {
-                       warn("passwd file update");
-                       return EX_IOERR;
-               }
-               if (cnf->nispasswd && *cnf->nispasswd=='/') {
-                       rc = addnispwent(cnf->nispasswd, pwd);
-                       if (rc == -1)
-                               warnx("User '%s' already exists in NIS passwd", pwd->pw_name);
-                       else
-                               warn("NIS passwd update");
-                       /* NOTE: we treat NIS-only update errors as non-fatal */
+       if ((p = strchr(uname, '&')) != NULL) {
+               int             l = strlen(pwd->pw_name);
+               int             m = strlen(p);
+
+               memmove(p + l, p + 1, m);
+               memmove(p, pwd->pw_name, l);
+               *p = (char) toupper((unsigned char)*p);
+       }
+       if (pwd->pw_expire > (time_t)0 && (tptr = localtime(&pwd->pw_expire)) != NULL)
+               strftime(acexpire, sizeof acexpire, "%c", tptr);
+               if (pwd->pw_change > (time_t)0 && (tptr = localtime(&pwd->pw_change)) != NULL)
+               strftime(pwexpire, sizeof pwexpire, "%c", tptr);
+       printf("Login Name: %-15s   #%-12ju Group: %-15s   #%ju\n"
+              " Full Name: %s\n"
+              "      Home: %-26.26s      Class: %s\n"
+              "     Shell: %-26.26s     Office: %s\n"
+              "Work Phone: %-26.26s Home Phone: %s\n"
+              "Acc Expire: %-26.26s Pwd Expire: %s\n",
+              pwd->pw_name, (uintmax_t)pwd->pw_uid,
+              grp ? grp->gr_name : "(invalid)", (uintmax_t)pwd->pw_gid,
+              uname, pwd->pw_dir, pwd->pw_class,
+              pwd->pw_shell, office, wphone, hphone,
+              acexpire, pwexpire);
+        SETGRENT();
+       j = 0;
+       while ((grp=GETGRENT()) != NULL) {
+               int     i = 0;
+               if (grp->gr_mem != NULL) {
+                       while (grp->gr_mem[i] != NULL) {
+                               if (strcmp(grp->gr_mem[i], pwd->pw_name)==0) {
+                                       printf(j++ == 0 ? "    Groups: %s" : ",%s", grp->gr_name);
+                                       break;
+                               }
+                               ++i;
+                       }
                }
                }
-       } else if (mode == M_UPDATE || mode == M_LOCK || mode == M_UNLOCK) {
-               if (edited) {   /* Only updated this if required */
-                       rc = chgpwent(a_name->val, pwd);
-                       if (rc == -1) {
-                               warnx("user '%s' does not exist (NIS?)", pwd->pw_name);
-                               return EX_IOERR;
-                       } else if (rc != 0) {
-                               warn("passwd file update");
-                               return EX_IOERR;
+       }
+       ENDGRENT();
+       printf("%s", j ? "\n" : "");
+       return (EXIT_SUCCESS);
+}
+
+char *
+pw_checkname(char *name, int gecos)
+{
+       char showch[8];
+       const char *badchars, *ch, *showtype;
+       int reject;
+
+       ch = name;
+       reject = 0;
+       if (gecos) {
+               /* See if the name is valid as a gecos (comment) field. */
+               badchars = ":!@";
+               showtype = "gecos field";
+       } else {
+               /* See if the name is valid as a userid or group. */
+               badchars = " ,\t:+&#%$^()!@~*?<>=|\\/\"";
+               showtype = "userid/group name";
+               /* Userids and groups can not have a leading '-'. */
+               if (*ch == '-')
+                       reject = 1;
+       }
+       if (!reject) {
+               while (*ch) {
+                       if (strchr(badchars, *ch) != NULL || *ch < ' ' ||
+                           *ch == 127) {
+                               reject = 1;
+                               break;
                        }
                        }
-                       if ( cnf->nispasswd && *cnf->nispasswd=='/') {
-                               rc = chgnispwent(cnf->nispasswd, a_name->val, pwd);
-                               if (rc == -1)
-                                       warn("User '%s' not found in NIS passwd", pwd->pw_name);
-                               else
-                                       warn("NIS passwd update");
-                               /* NOTE: NIS-only update errors are not fatal */
+                       /* 8-bit characters are only allowed in GECOS fields */
+                       if (!gecos && (*ch & 0x80)) {
+                               reject = 1;
+                               break;
                        }
                        }
+                       ch++;
                }
        }
                }
        }
-
        /*
        /*
-        * Ok, user is created or changed - now edit group file
+        * A `$' is allowed as the final character for userids and groups,
+        * mainly for the benefit of samba.
         */
         */
+       if (reject && !gecos) {
+               if (*ch == '$' && *(ch + 1) == '\0') {
+                       reject = 0;
+                       ch++;
+               }
+       }
+       if (reject) {
+               snprintf(showch, sizeof(showch), (*ch >= ' ' && *ch < 127)
+                   ? "`%c'" : "0x%02x", *ch);
+               errx(EX_DATAERR, "invalid character %s at position %td in %s",
+                   showch, (ch - name), showtype);
+       }
+       if (!gecos && (ch - name) > LOGNAMESIZE)
+               errx(EX_USAGE, "name too long `%s' (max is %d)", name,
+                   LOGNAMESIZE);
 
 
-       if (mode == M_ADD || getarg(args, 'G') != NULL) {
-               int i, j;
-               /* First remove the user from all group */
-               SETGRENT();
-               while ((grp = GETGRENT()) != NULL) {
-                       char group[MAXLOGNAME];
-                       if (grp->gr_mem == NULL)
-                               continue;
-                       for (i = 0; grp->gr_mem[i] != NULL; i++) {
-                               if (strcmp(grp->gr_mem[i] , pwd->pw_name) != 0)
-                                       continue;
-                               for (j = i; grp->gr_mem[j] != NULL ; j++)
-                                       grp->gr_mem[j] = grp->gr_mem[j+1];
-                               strlcpy(group, grp->gr_name, MAXLOGNAME);
-                               chggrent(group, grp);
+       return (name);
+}
+
+static void
+rmat(uid_t uid)
+{
+       DIR            *d = opendir("/var/at/jobs");
+
+       if (d != NULL) {
+               struct dirent  *e;
+
+               while ((e = readdir(d)) != NULL) {
+                       struct stat     st;
+
+                       if (strncmp(e->d_name, ".lock", 5) != 0 &&
+                           stat(e->d_name, &st) == 0 &&
+                           !S_ISDIR(st.st_mode) &&
+                           st.st_uid == uid) {
+                               char            tmp[MAXPATHLEN];
+
+                               snprintf(tmp, sizeof(tmp), "/usr/bin/atrm %s",
+                                   e->d_name);
+                               system(tmp);
                        }
                }
                        }
                }
-               ENDGRENT();
+               closedir(d);
+       }
+}
 
 
-               /* now add to group where needed */
-               for (i = 0; cnf->groups[i] != NULL; i++) {
-                       grp = GETGRNAM(cnf->groups[i]);
-                       grp = gr_add(grp, pwd->pw_name);
-                       /*
-                        * grp can only be NULL in 2 cases:
-                        * - the new member is already a member
-                        * - a problem with memory occurs
-                        * in both cases we want to skip now.
-                        */
-                       if (grp == NULL)
-                               continue;
-                       chggrent(cnf->groups[i], grp);
-                       free(grp);
+static void
+rmopie(char const * name)
+{
+       char tmp[1014];
+       FILE *fp;
+       int fd;
+       size_t len;
+       off_t   atofs = 0;
+       
+       if ((fd = openat(conf.rootfd, "etc/opiekeys", O_RDWR)) == -1)
+               return;
+
+       fp = fdopen(fd, "r+");
+       len = strlen(name);
+
+       while (fgets(tmp, sizeof(tmp), fp) != NULL) {
+               if (strncmp(name, tmp, len) == 0 && tmp[len]==' ') {
+                       /* Comment username out */
+                       if (fseek(fp, atofs, SEEK_SET) == 0)
+                               fwrite("#", 1, 1, fp);
+                       break;
                }
                }
+               atofs = ftell(fp);
        }
        }
+       /*
+        * If we got an error of any sort, don't update!
+        */
+       fclose(fp);
+}
 
 
-
-       /* go get a current version of pwd */
-       pwd = GETPWNAM(a_name->val);
-       if (pwd == NULL) {
-               /* This will fail when we rename, so special case that */
-               if (mode == M_UPDATE && (arg = getarg(args, 'l')) != NULL) {
-                       a_name->val = arg->val;         /* update new name */
-                       pwd = GETPWNAM(a_name->val);    /* refetch renamed rec */
+int
+pw_user_next(int argc, char **argv, char *name __unused)
+{
+       struct userconf *cnf = NULL;
+       const char *cfg = NULL;
+       int ch;
+       bool quiet = false;
+       uid_t next;
+
+       while ((ch = getopt(argc, argv, "Cq")) != -1) {
+               switch (ch) {
+               case 'C':
+                       cfg = optarg;
+                       break;
+               case 'q':
+                       quiet;
+                       break;
                }
        }
                }
        }
-       if (pwd == NULL)        /* can't go on without this */
-               errx(EX_NOUSER, "user '%s' disappeared during update", a_name->val);
 
 
-       grp = GETGRGID(pwd->pw_gid);
-       pw_log(cnf, mode, W_USER, "%s(%ld):%s(%ld):%s:%s:%s",
-              pwd->pw_name, (long) pwd->pw_uid,
-           grp ? grp->gr_name : "unknown", (long) (grp ? grp->gr_gid : -1),
-              pwd->pw_gecos, pwd->pw_dir, pwd->pw_shell);
+       if (quiet)
+               freopen(_PATH_DEVNULL, "w", stderr);
 
 
-       /*
-        * If adding, let's touch and chown the user's mail file. This is not
-        * strictly necessary under BSD with a 0755 maildir but it also
-        * doesn't hurt anything to create the empty mailfile
-        */
-       if (mode == M_ADD) {
-               if (!PWALTDIR()) {
-                       sprintf(line, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
-                       close(open(line, O_RDWR | O_CREAT, 0600));      /* Preserve contents &
-                                                                        * mtime */
-                       chown(line, pwd->pw_uid, pwd->pw_gid);
+       cnf = get_userconfig(cfg);
+
+       next = pw_uidpolicy(cnf, -1);
+
+       printf("%ju:", (uintmax_t)next);
+       pw_groupnext(cnf, quiet);
+
+       return (EXIT_SUCCESS);
+}
+
+int
+pw_user_show(int argc, char **argv, char *arg1)
+{
+       struct passwd *pwd = NULL;
+       char *name = NULL;
+       uid_t id = -1;
+       int ch;
+       bool all = false;
+       bool pretty = false;
+       bool force = false;
+       bool v7 = false;
+       bool quiet = false;
+
+       if (arg1 != NULL) {
+               if (strspn(arg1, "0123456789") == strlen(arg1))
+                       id = pw_checkid(arg1, UID_MAX);
+               else
+                       name = arg1;
+       }
+
+       while ((ch = getopt(argc, argv, "C:qn:u:FPa7")) != -1) {
+               switch (ch) {
+               case 'C':
+                       /* ignore compatibility */
+                       break;
+               case 'q':
+                       quiet = true;
+                       break;
+               case 'n':
+                       name = optarg;
+                       break;
+               case 'u':
+                       id = pw_checkid(optarg, UID_MAX);
+                       break;
+               case 'F':
+                       force = true;
+                       break;
+               case 'P':
+                       pretty = true;
+                       break;
+               case 'a':
+                       all = true;
+                       break;
+               case 7:
+                       v7 = true;
+                       break;
                }
        }
 
                }
        }
 
-       /*
-        * Let's create and populate the user's home directory. Note
-        * that this also `works' for editing users if -m is used, but
-        * existing files will *not* be overwritten.
-        */
-       if (!PWALTDIR() && getarg(args, 'm') != NULL && pwd->pw_dir && *pwd->pw_dir == '/' && pwd->pw_dir[1]) {
-               copymkdir(pwd->pw_dir, cnf->dotdir, cnf->homemode, pwd->pw_uid, pwd->pw_gid);
-               pw_log(cnf, mode, W_USER, "%s(%ld) home %s made",
-                      pwd->pw_name, (long) pwd->pw_uid, pwd->pw_dir);
+       if (quiet)
+               freopen(_PATH_DEVNULL, "w", stderr);
+
+       if (all) {
+               SETPWENT();
+               while ((pwd = GETPWENT()) != NULL)
+                       print_user(pwd, pretty, v7);
+               ENDPWENT();
+               return (EXIT_SUCCESS);
        }
 
        }
 
+       if (id < 0 && name == NULL)
+               errx(EX_DATAERR, "username or id required");
 
 
-       /*
-        * Finally, send mail to the new user as well, if we are asked to
-        */
-       if (mode == M_ADD && !PWALTDIR() && cnf->newmail && *cnf->newmail && (fp = fopen(cnf->newmail, "r")) != NULL) {
-               FILE           *pfp = popen(_PATH_SENDMAIL " -t", "w");
-               
-               if (pfp == NULL)
-                       warn("sendmail");
-               else {
-                       fprintf(pfp, "From: root\n" "To: %s\n" "Subject: Welcome!\n\n", pwd->pw_name);
-                       while (fgets(line, sizeof(line), fp) != NULL) {
-                               /* Do substitutions? */
-                               fputs(line, pfp);
-                       }
-                       pclose(pfp);
-                       pw_log(cnf, mode, W_USER, "%s(%ld) new user mail sent",
-                           pwd->pw_name, (long) pwd->pw_uid);
+       pwd = (name != NULL) ? GETPWNAM(pw_checkname(name, 0)) : GETPWUID(id);
+       if (pwd == NULL) {
+               if (force) {
+                       pwd = &fakeuser;
+               } else {
+                       if (name == NULL)
+                               errx(EX_NOUSER, "no such uid `%ju'",
+                                   (uintmax_t) id);
+                       errx(EX_NOUSER, "no such user `%s'", name);
                }
                }
-               fclose(fp);
        }
 
        }
 
-       return EXIT_SUCCESS;
+       return (print_user(pwd, pretty, v7));
 }
 
 }
 
-
-static          uid_t
-pw_uidpolicy(struct userconf * cnf, struct cargs * args)
+int
+pw_user_del(int argc, char **argv, char *arg1)
 {
 {
-       struct passwd  *pwd;
-       uid_t           uid = (uid_t) - 1;
-       struct carg    *a_uid = getarg(args, 'u');
+       struct userconf *cnf = NULL;
+       struct passwd *pwd = NULL;
+       struct group *gr, *grp;
+       char *name = NULL;
+       char grname[MAXLOGNAME];
+       char *nispasswd = NULL;
+       char file[MAXPATHLEN];
+       char home[MAXPATHLEN];
+       const char *cfg = NULL;
+       struct stat st;
+       uid_t id;
+       int ch, rc;
+       bool nis = false;
+       bool deletehome = false;
+       bool quiet = false;
+
+       if (arg1 != NULL) {
+               if (strspn(arg1, "0123456789") == strlen(arg1))
+                       id = pw_checkid(arg1, UID_MAX);
+               else
+                       name = arg1;
+       }
 
 
-       /*
-        * Check the given uid, if any
-        */
-       if (a_uid != NULL) {
-               uid = (uid_t) atol(a_uid->val);
+       while ((ch = getopt(argc, argv, "C:qn:u:rYy:")) != -1) {
+               switch (ch) {
+               case 'C':
+                       cfg = optarg;
+                       break;
+               case 'q':
+                       quiet = true;
+                       break;
+               case 'n':
+                       name = optarg;
+                       break;
+               case 'u':
+                       id = pw_checkid(optarg, UID_MAX);
+                       break;
+               case 'r':
+                       deletehome = true;
+                       break;
+               case 'y':
+                       nispasswd = optarg;
+                       break;
+               case 'Y':
+                       nis = true;
+                       break;
+               }
+       }
 
 
-               if ((pwd = GETPWUID(uid)) != NULL && getarg(args, 'o') == NULL)
-                       errx(EX_DATAERR, "uid `%ld' has already been allocated", (long) pwd->pw_uid);
-       } else {
-               struct bitmap   bm;
+       if (quiet)
+               freopen(_PATH_DEVNULL, "w", stderr);
 
 
-               /*
-                * We need to allocate the next available uid under one of
-                * two policies a) Grab the first unused uid b) Grab the
-                * highest possible unused uid
-                */
-               if (cnf->min_uid >= cnf->max_uid) {     /* Sanity
-                                                        * claus^H^H^H^Hheck */
-                       cnf->min_uid = 1000;
-                       cnf->max_uid = 32000;
-               }
-               bm = bm_alloc(cnf->max_uid - cnf->min_uid + 1);
+       if (id < 0 && name == NULL)
+               errx(EX_DATAERR, "username or id required");
 
 
-               /*
-                * Now, let's fill the bitmap from the password file
-                */
-               SETPWENT();
-               while ((pwd = GETPWENT()) != NULL)
-                       if (pwd->pw_uid >= (uid_t) cnf->min_uid && pwd->pw_uid <= (uid_t) cnf->max_uid)
-                               bm_setbit(&bm, pwd->pw_uid - cnf->min_uid);
-               ENDPWENT();
+       cnf = get_userconfig(cfg);
 
 
-               /*
-                * Then apply the policy, with fallback to reuse if necessary
-                */
-               if (cnf->reuse_uids || (uid = (uid_t) (bm_lastset(&bm) + cnf->min_uid + 1)) > cnf->max_uid)
-                       uid = (uid_t) (bm_firstunset(&bm) + cnf->min_uid);
+       if (nispasswd == NULL)
+               nispasswd = cnf->nispasswd;
 
 
-               /*
-                * Another sanity check
-                */
-               if (uid < cnf->min_uid || uid > cnf->max_uid)
-                       errx(EX_SOFTWARE, "unable to allocate a new uid - range fully used");
-               bm_dealloc(&bm);
+       pwd = (name != NULL) ? GETPWNAM(pw_checkname(name, 0)) : GETPWUID(id);
+       if (pwd == NULL) {
+               if (name == NULL)
+                       errx(EX_NOUSER, "no such uid `%ju'", (uintmax_t) id);
+               errx(EX_NOUSER, "no such user `%s'", name);
+       }
+
+       if (PWF._altdir == PWF_REGULAR &&
+           ((pwd->pw_fields & _PWF_SOURCE) != _PWF_FILES)) {
+               if ((pwd->pw_fields & _PWF_SOURCE) == _PWF_NIS) {
+                       if (!nis && nispasswd && *nispasswd != '/')
+                               errx(EX_NOUSER, "Cannot remove NIS user `%s'",
+                                   name);
+               } else {
+                       errx(EX_NOUSER, "Cannot remove non local user `%s'",
+                           name);
+               }
        }
        }
-       return uid;
-}
 
 
+       id = pwd->pw_uid;
+       if (name == NULL)
+               name = pwd->pw_name;
 
 
-static          uid_t
-pw_gidpolicy(struct userconf * cnf, struct cargs * args, char *nam, gid_t prefer)
-{
-       struct group   *grp;
-       gid_t           gid = (uid_t) - 1;
-       struct carg    *a_gid = getarg(args, 'g');
+       if (strcmp(pwd->pw_name, "root") == 0)
+               errx(EX_DATAERR, "cannot remove user 'root'");
 
 
-       /*
-        * If no arg given, see if default can help out
-        */
-       if (a_gid == NULL && cnf->default_group && *cnf->default_group)
-               a_gid = addarg(args, 'g', cnf->default_group);
+       /* Remove opie record from /etc/opiekeys */
+       if (PWALTDIR() != PWF_ALT)
+               rmopie(pwd->pw_name);
+
+       if (!PWALTDIR()) {
+               /* Remove crontabs */
+               snprintf(file, sizeof(file), "/var/cron/tabs/%s", pwd->pw_name);
+               if (access(file, F_OK) == 0) {
+                       snprintf(file, sizeof(file), "crontab -u %s -r",
+                           pwd->pw_name);
+                       system(file);
+               }
+       }
 
        /*
 
        /*
-        * Check the given gid, if any
+        * Save these for later, since contents of pwd may be
+        * invalidated by deletion
         */
         */
+       snprintf(file, sizeof(file), "%s/%s", _PATH_MAILDIR, pwd->pw_name);
+       strlcpy(home, pwd->pw_dir, sizeof(home));
+       gr = GETGRGID(pwd->pw_gid);
+       if (gr != NULL)
+               strlcpy(grname, gr->gr_name, LOGNAMESIZE);
+       else
+               grname[0] = '\0';
+
+       rc = delpwent(pwd);
+       if (rc == -1)
+               err(EX_IOERR, "user '%s' does not exist", pwd->pw_name);
+       else if (rc != 0)
+               err(EX_IOERR, "passwd update");
+
+       if (nis && nispasswd && *nispasswd=='/') {
+               rc = delnispwent(nispasswd, name);
+               if (rc == -1)
+                       warnx("WARNING: user '%s' does not exist in NIS passwd",
+                           pwd->pw_name);
+               else if (rc != 0)
+                       warn("WARNING: NIS passwd update");
+       }
+
+       grp = GETGRNAM(name);
+       if (grp != NULL &&
+           (grp->gr_mem == NULL || *grp->gr_mem == NULL) &&
+           strcmp(name, grname) == 0)
+               delgrent(GETGRNAM(name));
        SETGRENT();
        SETGRENT();
-       if (a_gid != NULL) {
-               if ((grp = GETGRNAM(a_gid->val)) == NULL) {
-                       gid = (gid_t) atol(a_gid->val);
-                       if ((gid == 0 && !isdigit((unsigned char)*a_gid->val)) || (grp = GETGRGID(gid)) == NULL)
-                               errx(EX_NOUSER, "group `%s' is not defined", a_gid->val);
-               }
-               gid = grp->gr_gid;
-       } else if ((grp = GETGRNAM(nam)) != NULL &&
-           (grp->gr_mem == NULL || grp->gr_mem[0] == NULL)) {
-               gid = grp->gr_gid;  /* Already created? Use it anyway... */
-       } else {
-               struct cargs    grpargs;
-               char            tmp[32];
+       while ((grp = GETGRENT()) != NULL) {
+               int i, j;
+               char group[MAXLOGNAME];
+               if (grp->gr_mem == NULL)
+                       continue;
 
 
-               LIST_INIT(&grpargs);
-               addarg(&grpargs, 'n', nam);
+               for (i = 0; grp->gr_mem[i] != NULL; i++) {
+                       if (strcmp(grp->gr_mem[i], name) != 0)
+                               continue;
 
 
-               /*
-                * We need to auto-create a group with the user's name. We
-                * can send all the appropriate output to our sister routine
-                * bit first see if we can create a group with gid==uid so we
-                * can keep the user and group ids in sync. We purposely do
-                * NOT check the gid range if we can force the sync. If the
-                * user's name dups an existing group, then the group add
-                * function will happily handle that case for us and exit.
-                */
-               if (GETGRGID(prefer) == NULL) {
-                       sprintf(tmp, "%lu", (unsigned long) prefer);
-                       addarg(&grpargs, 'g', tmp);
-               }
-               if (getarg(args, 'N'))
-               {
-                       addarg(&grpargs, 'N', NULL);
-                       addarg(&grpargs, 'q', NULL);
-                       gid = pw_group(cnf, M_NEXT, &grpargs);
-               }
-               else
-               {
-                       pw_group(cnf, M_ADD, &grpargs);
-                       if ((grp = GETGRNAM(nam)) != NULL)
-                               gid = grp->gr_gid;
-               }
-               a_gid = LIST_FIRST(&grpargs);
-               while (a_gid != NULL) {
-                       struct carg    *t = LIST_NEXT(a_gid, list);
-                       LIST_REMOVE(a_gid, list);
-                       a_gid = t;
+                       for (j = i; grp->gr_mem[j] != NULL; j++)
+                               grp->gr_mem[j] = grp->gr_mem[j+1];
+                       strlcpy(group, grp->gr_name, MAXLOGNAME);
+                       chggrent(group, grp);
                }
        }
        ENDGRENT();
                }
        }
        ENDGRENT();
-       return gid;
-}
 
 
+       pw_log(cnf, M_DELETE, W_USER, "%s(%ju) account removed", name,
+           (uintmax_t)id);
+
+       /* Remove mail file */
+       if (PWALTDIR() != PWF_ALT)
+               unlinkat(conf.rootfd, file + 1, 0);
+
+       /* Remove at jobs */
+       if (!PWALTDIR() && getpwuid(id) == NULL)
+               rmat(id);
+
+       /* Remove home directory and contents */
+       if (PWALTDIR() != PWF_ALT && deletehome && *home == '/' &&
+           GETPWUID(id) == NULL &&
+           fstatat(conf.rootfd, home + 1, &st, 0) != -1) {
+               rm_r(conf.rootfd, home, id);
+               pw_log(cnf, M_DELETE, W_USER, "%s(%ju) home '%s' %s"
+                   "removed", name, (uintmax_t)id, home,
+                    fstatat(conf.rootfd, home + 1, &st, 0) == -1 ? "" : "not "
+                    "completely ");
+       }
 
 
-static          time_t
-pw_pwdpolicy(struct userconf * cnf, struct cargs * args)
-{
-       time_t          result = 0;
-       time_t          now = time(NULL);
-       struct carg    *arg = getarg(args, 'p');
-
-       if (arg != NULL) {
-               if ((result = parse_date(now, arg->val)) == now)
-                       errx(EX_DATAERR, "invalid date/time `%s'", arg->val);
-       } else if (cnf->password_days > 0)
-               result = now + ((long) cnf->password_days * 86400L);
-       return result;
+       return (EXIT_SUCCESS);
 }
 
 }
 
+int
+pw_user_lock(int argc, char **argv, char *arg1)
+{
+       int ch;
+
+       while ((ch = getopt(argc, argv, "Cq")) != -1) {
+               switch (ch) {
+               case 'C':
+               case 'q':
+                       /* compatibility */
+                       break;
+               }
+       }
+
+       return (pw_userlock(arg1, M_LOCK));
+}
 
 
-static          time_t
-pw_exppolicy(struct userconf * cnf, struct cargs * args)
+int
+pw_user_unlock(int argc, char **argv, char *arg1)
 {
 {
-       time_t          result = 0;
-       time_t          now = time(NULL);
-       struct carg    *arg = getarg(args, 'e');
-
-       if (arg != NULL) {
-               if ((result = parse_date(now, arg->val)) == now)
-                       errx(EX_DATAERR, "invalid date/time `%s'", arg->val);
-       } else if (cnf->expire_days > 0)
-               result = now + ((long) cnf->expire_days * 86400L);
-       return result;
+       int ch;
+
+       while ((ch = getopt(argc, argv, "Cq")) != -1) {
+               switch (ch) {
+               case 'C':
+               case 'q':
+                       /* compatibility */
+                       break;
+               }
+       }
+
+       return (pw_userlock(arg1, M_UNLOCK));
 }
 
 }
 
+static struct group *
+group_from_name_or_id(char *name)
+{
+       const char *errstr = NULL;
+       struct group *grp;
+       uintmax_t id;
+
+       if ((grp = GETGRNAM(name)) == NULL) {
+               id = strtounum(name, 0, GID_MAX, &errstr);
+               if (errstr)
+                       errx(EX_NOUSER, "group `%s' does not exist", name);
+               grp = GETGRGID(id);
+               if (grp == NULL)
+                       errx(EX_NOUSER, "group `%s' does not exist", name);
+       }
+
+       return (grp);
+}
 
 
-static char    *
-pw_homepolicy(struct userconf * cnf, struct cargs * args, char const * user)
+static void
+split_groups(StringList **groups, char *groupsstr)
 {
 {
-       struct carg    *arg = getarg(args, 'd');
+       struct group *grp;
+       char *p;
+       char tok[] = ", \t";
+
+       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));
+       }
+}
 
 
-       if (arg)
-               return arg->val;
-       else {
-               static char     home[128];
+static void
+validate_grname(struct userconf *cnf, char *group)
+{
+       struct group *grp;
 
 
-               if (cnf->home == NULL || *cnf->home == '\0')
-                       errx(EX_CONFIG, "no base home directory set");
-               sprintf(home, "%s/%s", cnf->home, user);
-               return home;
+       if (group == NULL || *group == '\0') {
+               cnf->default_group = "";
+               return;
        }
        }
+       grp = group_from_name_or_id(group);
+       cnf->default_group = newstr(grp->gr_name);
 }
 
 }
 
-static char    *
-shell_path(char const * path, char *shells[], char *sh)
+static mode_t
+validate_mode(char *mode)
 {
 {
-       if (sh != NULL && (*sh == '/' || *sh == '\0'))
-               return sh;      /* specified full path or forced none */
-       else {
-               char           *p;
-               char            paths[_UC_MAXLINE];
+       mode_t m;
+       void *set;
 
 
-               /*
-                * We need to search paths
-                */
-               strlcpy(paths, path, sizeof(paths));
-               for (p = strtok(paths, ": \t\r\n"); p != NULL; p = strtok(NULL, ": \t\r\n")) {
-                       int             i;
-                       static char     shellpath[256];
+       if ((set = setmode(mode)) == NULL)
+               errx(EX_DATAERR, "invalid directory creation mode '%s'", mode);
 
 
-                       if (sh != NULL) {
-                               sprintf(shellpath, "%s/%s", p, sh);
-                               if (access(shellpath, X_OK) == 0)
-                                       return shellpath;
-                       } else
-                               for (i = 0; i < _UC_MAXSHELLS && shells[i] != NULL; i++) {
-                                       sprintf(shellpath, "%s/%s", p, shells[i]);
-                                       if (access(shellpath, X_OK) == 0)
-                                               return shellpath;
-                               }
-               }
-               if (sh == NULL)
-                       errx(EX_OSFILE, "can't find shell `%s' in shell paths", sh);
-               errx(EX_CONFIG, "no default shell available or defined");
-               return NULL;
-       }
+       m = getmode(set, _DEF_DIRMODE);
+       free(set);
+       return (m);
 }
 
 }
 
-
-static char    *
-pw_shellpolicy(struct userconf * cnf, struct cargs * args, char *newshell)
+static void
+mix_config(struct userconf *cmdcnf, struct userconf *cfg)
 {
 {
-       char           *sh = newshell;
-       struct carg    *arg = getarg(args, 's');
 
 
-       if (newshell == NULL && arg != NULL)
-               sh = arg->val;
-       return shell_path(cnf->shelldir, cnf->shells, sh ? sh : cnf->shell_default);
+       if (cmdcnf->default_password == 0)
+               cmdcnf->default_password = cfg->default_password;
+       if (cmdcnf->reuse_uids == 0)
+               cmdcnf->reuse_uids = cfg->reuse_uids;
+       if (cmdcnf->reuse_gids == 0)
+               cmdcnf->reuse_gids = cfg->reuse_gids;
+       if (cmdcnf->nispasswd == NULL)
+               cmdcnf->nispasswd = cfg->nispasswd;
+       if (cmdcnf->dotdir == NULL)
+               cmdcnf->dotdir = cfg->dotdir;
+       if (cmdcnf->newmail == NULL)
+               cmdcnf->newmail = cfg->newmail;
+       if (cmdcnf->logfile == NULL)
+               cmdcnf->logfile = cfg->logfile;
+       if (cmdcnf->home == NULL)
+               cmdcnf->home = cfg->home;
+       if (cmdcnf->homemode == 0)
+               cmdcnf->homemode = cfg->homemode;
+       if (cmdcnf->shelldir == NULL)
+               cmdcnf->shelldir = cfg->shelldir;
+       if (cmdcnf->shells == NULL)
+               cmdcnf->shells = cfg->shells;
+       if (cmdcnf->shell_default == NULL)
+               cmdcnf->shell_default = cfg->shell_default;
+       if (cmdcnf->default_group == NULL)
+               cmdcnf->default_group = cfg->default_group;
+       if (cmdcnf->groups == NULL)
+               cmdcnf->groups = cfg->groups;
+       if (cmdcnf->default_class == NULL)
+               cmdcnf->default_class = cfg->default_class;
+       if (cmdcnf->min_uid == 0)
+               cmdcnf->min_uid = cfg->min_uid;
+       if (cmdcnf->max_uid == 0)
+               cmdcnf->max_uid = cfg->max_uid;
+       if (cmdcnf->min_gid == 0)
+               cmdcnf->min_gid = cfg->min_gid;
+       if (cmdcnf->max_gid == 0)
+               cmdcnf->max_gid = cfg->max_gid;
+       if (cmdcnf->expire_days == 0)
+               cmdcnf->expire_days = cfg->expire_days;
+       if (cmdcnf->password_days == 0)
+               cmdcnf->password_days = cfg->password_days;
 }
 
 }
 
-#define        SALTSIZE        32
+int
+pw_user_add(int argc, char **argv, char *arg1)
+{
+       struct userconf *cnf, *cmdcnf;
+       struct passwd *pwd;
+       struct group *grp;
+       struct stat st;
+       char args[] = "C:qn:u:c:d:e:p:g:G:mM:k:s:oL:i:w:h:H:Db:NPy:Y";
+       char line[_PASSWORD_LEN+1], path[MAXPATHLEN];
+       char *gecos, *homedir, *skel, *walk, *userid, *groupid, *grname;
+       char *default_passwd, *name, *p;
+       const char *cfg;
+       login_cap_t *lc;
+       FILE *pfp, *fp;
+       intmax_t id = -1;
+       time_t now;
+       int rc, ch, fd = -1;
+       size_t i;
+       bool dryrun, nis, pretty, quiet, createhome, precrypted, genconf;
+
+       dryrun = nis = pretty = quiet = createhome = precrypted = false;
+       genconf = false;
+       gecos = homedir = skel = userid = groupid = default_passwd = NULL;
+       grname = name = NULL;
+
+       if ((cmdcnf = calloc(1, sizeof(struct userconf))) == NULL)
+               err(EXIT_FAILURE, "calloc()");
+
+       if (arg1 != NULL) {
+               if (strspn(arg1, "0123456789") == strlen(arg1))
+                       id = pw_checkid(arg1, UID_MAX);
+               else
+                       name = arg1;
+       }
 
 
-static char const chars[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ./";
+       while ((ch = getopt(argc, argv, args)) != -1) {
+               switch (ch) {
+               case 'C':
+                       cfg = optarg;
+                       break;
+               case 'q':
+                       quiet = true;
+                       break;
+               case 'n':
+                       name = optarg;
+                       break;
+               case 'u':
+                       userid = optarg;
+                       break;
+               case 'c':
+                       gecos = pw_checkname(optarg, 1);
+                       break;
+               case 'd':
+                       homedir = optarg;
+                       break;
+               case 'e':
+                       now = time(NULL);
+                       cmdcnf->expire_days = parse_date(now, optarg);
+                       break;
+               case 'p':
+                       now = time(NULL);
+                       cmdcnf->password_days = parse_date(now, optarg);
+                       break;
+               case 'g':
+                       validate_grname(cmdcnf, optarg);
+                       grname = optarg;
+                       break;
+               case 'G':
+                       split_groups(&cmdcnf->groups, optarg);
+                       break;
+               case 'm':
+                       createhome = true;
+                       break;
+               case 'M':
+                       cmdcnf->homemode = validate_mode(optarg);
+                       break;
+               case 'k':
+                       walk = skel = optarg;
+                       if (*walk == '/')
+                               walk++;
+                       if (fstatat(conf.rootfd, walk, &st, 0) == -1)
+                               errx(EX_OSFILE, "skeleton `%s' does not "
+                                   "exists", skel);
+                       if (!S_ISDIR(st.st_mode))
+                               errx(EX_OSFILE, "skeleton `%s' is not a "
+                                   "directory", skel);
+                       cmdcnf->dotdir = skel;
+                       break;
+               case 's':
+                       cmdcnf->shell_default = optarg;
+                       break;
+               case 'o':
+                       conf.checkduplicate = false;
+                       break;
+               case 'L':
+                       cmdcnf->default_class = pw_checkname(optarg, 0);
+                       break;
+               case 'i':
+                       groupid = optarg;
+                       break;
+               case 'w':
+                       default_passwd = optarg;
+                       break;
+               case 'H':
+                       if (fd != -1)
+                               errx(EX_USAGE, "'-h' and '-H' are mutually "
+                                   "exclusive options");
+                       fd = pw_checkfd(optarg);
+                       precrypted = true;
+                       if (fd == '-')
+                               errx(EX_USAGE, "-H expects a file descriptor");
+                       break;
+               case 'h':
+                       if (fd != -1)
+                               errx(EX_USAGE, "'-h' and '-H' are mutually "
+                                   "exclusive options");
+                       fd = pw_checkfd(optarg);
+                       break;
+               case 'D':
+                       genconf = true;
+                       break;
+               case 'b':
+                       cmdcnf->home = optarg;
+                       break;
+               case 'N':
+                       dryrun = true;
+                       break;
+               case 'P':
+                       pretty = true;
+                       break;
+               case 'y':
+                       cmdcnf->nispasswd = optarg;
+                       break;
+               case 'Y':
+                       nis = true;
+                       break;
+               }
+       }
 
 
-char           *
-pw_pwcrypt(char *password)
-{
-       int             i;
-       char            salt[SALTSIZE + 1];
-       char            *cryptpw;
+       if (geteuid() != 0 && ! dryrun)
+               errx(EX_NOPERM, "you must be root");
 
 
-       static char     buf[256];
+       if (quiet)
+               freopen(_PATH_DEVNULL, "w", stderr);
+
+       cnf = get_userconfig(cfg);
+
+       mix_config(cmdcnf, cnf);
+       if (default_passwd)
+               cmdcnf->default_password = boolean_val(default_passwd,
+                   cnf->default_password);
+       if (genconf) {
+               if (name != NULL)
+                       errx(EX_DATAERR, "can't combine `-D' with `-n name'");
+               if (userid != NULL) {
+                       if ((p = strtok(userid, ", \t")) != NULL)
+                               cmdcnf->min_uid = pw_checkid(p, UID_MAX);
+                       if (cmdcnf->min_uid == 0)
+                               cmdcnf->min_uid = 1000;
+                       if ((p = strtok(NULL, " ,\t")) != NULL)
+                               cmdcnf->max_uid = pw_checkid(p, UID_MAX);
+                       if (cmdcnf->max_uid == 0)
+                               cmdcnf->max_uid = 32000;
+               }
+               if (groupid != NULL) {
+                       if ((p = strtok(groupid, ", \t")) != NULL)
+                               cmdcnf->min_gid = pw_checkid(p, GID_MAX);
+                       if (cmdcnf->min_gid == 0)
+                               cmdcnf->min_gid = 1000;
+                       if ((p = strtok(NULL, " ,\t")) != NULL)
+                               cmdcnf->max_gid = pw_checkid(p, GID_MAX);
+                       if (cmdcnf->max_gid == 0)
+                               cmdcnf->max_gid = 32000;
+               }
+               if (write_userconfig(cmdcnf, cfg))
+                       return (EXIT_SUCCESS);
+               err(EX_IOERR, "config update");
+       }
+
+       if (userid)
+               id = pw_checkid(userid, UID_MAX);
+       if (id < 0 && name == NULL)
+               errx(EX_DATAERR, "user name or id required");
+
+       if (name == NULL)
+               errx(EX_DATAERR, "login name required");
+
+       if (GETPWNAM(name) != NULL)
+               errx(EX_DATAERR, "login name `%s' already exists", name);
+
+       pwd = &fakeuser;
+       pwd->pw_name = name;
+       pwd->pw_class = cmdcnf->default_class ? cmdcnf->default_class : "";
+       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;
+       pwd->pw_dir = pw_homepolicy(cmdcnf, homedir, pwd->pw_name);
+       pwd->pw_shell = pw_shellpolicy(cmdcnf);
+       lc = login_getpwclass(pwd);
+       if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
+               warn("setting crypt(3) format");
+       login_close(lc);
+       pwd->pw_passwd = pw_password(cmdcnf, pwd->pw_name, dryrun);
+       if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
+               warnx("WARNING: new account `%s' has a uid of 0 "
+                   "(superuser access!)", pwd->pw_name);
+       if (gecos)
+               pwd->pw_gecos = gecos;
+
+       if (fd != -1)
+               pw_set_passwd(pwd, fd, precrypted, false);
+
+       if (dryrun)
+               return (print_user(pwd, pretty, false));
+
+       if ((rc = addpwent(pwd)) != 0) {
+               if (rc == -1)
+                       errx(EX_IOERR, "user '%s' already exists",
+                           pwd->pw_name);
+               else if (rc != 0)
+                       err(EX_IOERR, "passwd file update");
+       }
+       if (nis && cmdcnf->nispasswd && *cmdcnf->nispasswd == '/') {
+               printf("%s\n", cmdcnf->nispasswd);
+               rc = addnispwent(cmdcnf->nispasswd, pwd);
+               if (rc == -1)
+                       warnx("User '%s' already exists in NIS passwd",
+                           pwd->pw_name);
+               else if (rc != 0)
+                       warn("NIS passwd update");
+               /* NOTE: we treat NIS-only update errors as non-fatal */
+       }
+
+       if (cmdcnf->groups != NULL) {
+               for (i = 0; i < cmdcnf->groups->sl_cur; i++) {
+                       grp = GETGRNAM(cmdcnf->groups->sl_str[i]);
+                       grp = gr_add(grp, pwd->pw_name);
+                       /*
+                        * grp can only be NULL in 2 cases:
+                        * - the new member is already a member
+                        * - a problem with memory occurs
+                        * in both cases we want to skip now.
+                        */
+                       if (grp == NULL)
+                               continue;
+                       chggrent(grp->gr_name, grp);
+                       free(grp);
+               }
+       }
+
+       pwd = GETPWNAM(name);
+       if (pwd == NULL)
+               errx(EX_NOUSER, "user '%s' disappeared during update", name);
+
+       grp = GETGRGID(pwd->pw_gid);
+       pw_log(cnf, M_ADD, W_USER, "%s(%ju):%s(%ju):%s:%s:%s",
+              pwd->pw_name, (uintmax_t)pwd->pw_uid,
+           grp ? grp->gr_name : "unknown",
+              (uintmax_t)(grp ? grp->gr_gid : (uid_t)-1),
+              pwd->pw_gecos, pwd->pw_dir, pwd->pw_shell);
 
        /*
 
        /*
-        * Calculate a salt value
+        * let's touch and chown the user's mail file. This is not
+        * strictly necessary under BSD with a 0755 maildir but it also
+        * doesn't hurt anything to create the empty mailfile
         */
         */
-       for (i = 0; i < SALTSIZE; i++)
-               salt[i] = chars[arc4random_uniform(sizeof(chars) - 1)];
-       salt[SALTSIZE] = '\0';
+       if (PWALTDIR() != PWF_ALT) {
+               snprintf(path, sizeof(path), "%s/%s", _PATH_MAILDIR,
+                   pwd->pw_name);
+               /* Preserve contents & mtime */
+               close(openat(conf.rootfd, path +1, O_RDWR | O_CREAT, 0600));
+               fchownat(conf.rootfd, path + 1, pwd->pw_uid, pwd->pw_gid,
+                   AT_SYMLINK_NOFOLLOW);
+       }
 
 
-       cryptpw = crypt(password, salt);
-       if (cryptpw == NULL)
-               errx(EX_CONFIG, "crypt(3) failure");
-       return strcpy(buf, cryptpw);
-}
+       /*
+        * Let's create and populate the user's home directory. Note
+        * that this also `works' for editing users if -m is used, but
+        * existing files will *not* be overwritten.
+        */
+       if (PWALTDIR() != PWF_ALT && createhome && pwd->pw_dir &&
+           *pwd->pw_dir == '/' && pwd->pw_dir[1])
+               create_and_populate_homedir(cmdcnf, pwd, cmdcnf->dotdir,
+                   cmdcnf->homemode, false);
+
+       if (!PWALTDIR() && cmdcnf->newmail && *cmdcnf->newmail &&
+           (fp = fopen(cnf->newmail, "r")) != NULL) {
+               if ((pfp = popen(_PATH_SENDMAIL " -t", "w")) == NULL)
+                       warn("sendmail");
+               else {
+                       fprintf(pfp, "From: root\n" "To: %s\n"
+                           "Subject: Welcome!\n\n", pwd->pw_name);
+                       while (fgets(line, sizeof(line), fp) != NULL) {
+                               /* Do substitutions? */
+                               fputs(line, pfp);
+                       }
+                       pclose(pfp);
+                       pw_log(cnf, M_ADD, W_USER, "%s(%ju) new user mail sent",
+                           pwd->pw_name, (uintmax_t)pwd->pw_uid);
+               }
+               fclose(fp);
+       }
 
 
+       if (nis && nis_update() == 0)
+               pw_log(cnf, M_ADD, W_USER, "NIS maps updated");
 
 
-static char    *
-pw_password(struct userconf * cnf, struct cargs * args, char const * user)
-{
-       int             i, l;
-       char            pwbuf[32];
+       return (EXIT_SUCCESS);
+}
 
 
-       switch (cnf->default_password) {
-       case -1:                /* Random password */
-               l = (arc4random() % 8 + 8);     /* 8 - 16 chars */
-               for (i = 0; i < l; i++)
-                       pwbuf[i] = chars[arc4random_uniform(sizeof(chars)-1)];
-               pwbuf[i] = '\0';
+int
+pw_user_mod(int argc, char **argv, char *arg1)
+{
+       struct userconf *cnf;
+       struct passwd *pwd;
+       struct group *grp;
+       StringList *groups = NULL;
+       char args[] = "C:qn:u:c:d:e:p:g:G:mM:l:k:s:w:L:h:H:NPYy:";
+       const char *cfg;
+       char *gecos, *homedir, *grname, *name, *newname, *walk, *skel, *shell;
+       char *passwd, *class, *nispasswd;
+       login_cap_t *lc;
+       struct stat st;
+       intmax_t id = -1;
+       int ch, fd = -1;
+       size_t i, j;
+       bool quiet, createhome, pretty, dryrun, nis, edited, docreatehome;
+       mode_t homemode = 0;
+       time_t expire_days, password_days, now, precrypted;
+
+       expire_days = password_days = -1;
+       gecos = homedir = grname = name = newname = skel = shell =NULL;
+       passwd = NULL;
+       class = nispasswd = NULL;
+       quiet = createhome = pretty = dryrun = nis = precrypted = false;
+       edited = docreatehome = false;
+
+       if (arg1 != NULL) {
+               if (strspn(arg1, "0123456789") == strlen(arg1))
+                       id = pw_checkid(arg1, UID_MAX);
+               else
+                       name = arg1;
+       }
 
 
-               /*
-                * We give this information back to the user
-                */
-               if (getarg(args, 'h') == NULL && getarg(args, 'H') == NULL &&
-                   getarg(args, 'N') == NULL) {
-                       if (isatty(STDOUT_FILENO))
-                               printf("Password for '%s' is: ", user);
-                       printf("%s\n", pwbuf);
-                       fflush(stdout);
+       while ((ch = getopt(argc, argv, args)) != -1) {
+               switch (ch) {
+               case 'C':
+                       cfg = optarg;
+                       break;
+               case 'q':
+                       quiet = true;
+                       break;
+               case 'n':
+                       name = optarg;
+                       break;
+               case 'u':
+                       id = pw_checkid(optarg, UID_MAX);
+                       break;
+               case 'c':
+                       gecos = pw_checkname(optarg, 1);
+                       break;
+               case 'd':
+                       homedir = optarg;
+                       break;
+               case 'e':
+                       now = time(NULL);
+                       expire_days = parse_date(now, optarg);
+                       break;
+               case 'p':
+                       now = time(NULL);
+                       password_days = parse_date(now, optarg);
+                       break;
+               case 'g':
+                       group_from_name_or_id(optarg);
+                       grname = optarg;
+                       break;
+               case 'G':
+                       split_groups(&groups, optarg);
+                       break;
+               case 'm':
+                       createhome = true;
+                       break;
+               case 'M':
+                       homemode = validate_mode(optarg);
+                       break;
+               case 'l':
+                       newname = optarg;
+                       break;
+               case 'k':
+                       walk = skel = optarg;
+                       if (*walk == '/')
+                               walk++;
+                       if (fstatat(conf.rootfd, walk, &st, 0) == -1)
+                               errx(EX_OSFILE, "skeleton `%s' does not "
+                                   "exists", skel);
+                       if (!S_ISDIR(st.st_mode))
+                               errx(EX_OSFILE, "skeleton `%s' is not a "
+                                   "directory", skel);
+                       break;
+               case 's':
+                       shell = optarg;
+                       break;
+               case 'w':
+                       passwd = optarg;
+                       break;
+               case 'L':
+                       class = pw_checkname(optarg, 0);
+                       break;
+               case 'H':
+                       if (fd != -1)
+                               errx(EX_USAGE, "'-h' and '-H' are mutually "
+                                   "exclusive options");
+                       fd = pw_checkfd(optarg);
+                       precrypted = true;
+                       if (fd == '-')
+                               errx(EX_USAGE, "-H expects a file descriptor");
+                       break;
+               case 'h':
+                       if (fd != -1)
+                               errx(EX_USAGE, "'-h' and '-H' are mutually "
+                                   "exclusive options");
+                       fd = pw_checkfd(optarg);
+                       break;
+               case 'N':
+                       dryrun = true;
+                       break;
+               case 'P':
+                       pretty = true;
+                       break;
+               case 'y':
+                       nispasswd = optarg;
+                       break;
+               case 'Y':
+                       nis = true;
+                       break;
                }
                }
-               break;
+       }
 
 
-       case -2:                /* No password at all! */
-               return "";
+       if (geteuid() != 0 && ! dryrun)
+               errx(EX_NOPERM, "you must be root");
 
 
-       case 0:         /* No login - default */
-       default:
-               return "*";
+       if (quiet)
+               freopen(_PATH_DEVNULL, "w", stderr);
 
 
-       case 1:         /* user's name */
-               strlcpy(pwbuf, user, sizeof(pwbuf));
-               break;
-       }
-       return pw_pwcrypt(pwbuf);
-}
+       cnf = get_userconfig(cfg);
 
 
+       if (id < 0 && name == NULL)
+               errx(EX_DATAERR, "username or id required");
 
 
-static int
-print_user(struct passwd * pwd, int pretty, int v7)
-{
-       if (!pretty) {
-               char            *buf;
+       pwd = (name != NULL) ? GETPWNAM(pw_checkname(name, 0)) : GETPWUID(id);
+       if (pwd == NULL) {
+               if (name == NULL)
+                       errx(EX_NOUSER, "no such uid `%ju'",
+                           (uintmax_t) id);
+               errx(EX_NOUSER, "no such user `%s'", name);
+       }
 
 
-               if (!v7)
-                       pwd->pw_passwd = (pwd->pw_passwd == NULL) ? "" : "*";
+       if (name == NULL)
+               name = pwd->pw_name;
 
 
-               buf = v7 ? pw_make_v7(pwd) : pw_make(pwd);
-               printf("%s\n", buf);
-               free(buf);
-       } else {
-               int             j;
-               char           *p;
-               struct group   *grp = GETGRGID(pwd->pw_gid);
-               char            uname[60] = "User &", office[60] = "[None]",
-                               wphone[60] = "[None]", hphone[60] = "[None]";
-               char            acexpire[32] = "[None]", pwexpire[32] = "[None]";
-               struct tm *    tptr;
-
-               if ((p = strtok(pwd->pw_gecos, ",")) != NULL) {
-                       strlcpy(uname, p, sizeof(uname));
-                       if ((p = strtok(NULL, ",")) != NULL) {
-                               strlcpy(office, p, sizeof(office));
-                               if ((p = strtok(NULL, ",")) != NULL) {
-                                       strlcpy(wphone, p, sizeof(wphone));
-                                       if ((p = strtok(NULL, "")) != NULL) {
-                                               strlcpy(hphone, p,
-                                                   sizeof(hphone));
-                                       }
-                               }
-                       }
-               }
-               /*
-                * Handle '&' in gecos field
-                */
-               if ((p = strchr(uname, '&')) != NULL) {
-                       int             l = strlen(pwd->pw_name);
-                       int             m = strlen(p);
+       if (nis && nispasswd == NULL)
+               nispasswd = cnf->nispasswd;
 
 
-                       memmove(p + l, p + 1, m);
-                       memmove(p, pwd->pw_name, l);
-                       *p = (char) toupper((unsigned char)*p);
-               }
-               if (pwd->pw_expire > (time_t)0 && (tptr = localtime(&pwd->pw_expire)) != NULL)
-                       strftime(acexpire, sizeof acexpire, "%c", tptr);
-               if (pwd->pw_change > (time_t)0 && (tptr = localtime(&pwd->pw_change)) != NULL)
-                       strftime(pwexpire, sizeof pwexpire, "%c", tptr);
-               printf("Login Name: %-15s   #%-12ld Group: %-15s   #%ld\n"
-                      " Full Name: %s\n"
-                      "      Home: %-26.26s      Class: %s\n"
-                      "     Shell: %-26.26s     Office: %s\n"
-                      "Work Phone: %-26.26s Home Phone: %s\n"
-                      "Acc Expire: %-26.26s Pwd Expire: %s\n",
-                      pwd->pw_name, (long) pwd->pw_uid,
-                      grp ? grp->gr_name : "(invalid)", (long) pwd->pw_gid,
-                      uname, pwd->pw_dir, pwd->pw_class,
-                      pwd->pw_shell, office, wphone, hphone,
-                      acexpire, pwexpire);
-               SETGRENT();
-               j = 0;
-               while ((grp=GETGRENT()) != NULL)
-               {
-                       int     i = 0;
-                       if (grp->gr_mem != NULL) {
-                               while (grp->gr_mem[i] != NULL)
-                               {
-                                       if (strcmp(grp->gr_mem[i], pwd->pw_name)==0)
-                                       {
-                                               printf(j++ == 0 ? "    Groups: %s" : ",%s", grp->gr_name);
-                                               break;
-                                       }
-                                       ++i;
-                               }
-                       }
+       if (PWF._altdir == PWF_REGULAR &&
+           ((pwd->pw_fields & _PWF_SOURCE) != _PWF_FILES)) {
+               if ((pwd->pw_fields & _PWF_SOURCE) == _PWF_NIS) {
+                       if (!nis && nispasswd && *nispasswd != '/')
+                               errx(EX_NOUSER, "Cannot modify NIS user `%s'",
+                                   name);
+               } else {
+                       errx(EX_NOUSER, "Cannot modify non local user `%s'",
+                           name);
                }
                }
-               ENDGRENT();
-               printf("%s", j ? "\n" : "");
        }
        }
-       return EXIT_SUCCESS;
-}
 
 
-char    *
-pw_checkname(u_char *name, int gecos)
-{
-       char showch[8];
-       u_char const *badchars, *ch, *showtype;
-       int reject;
+       if (newname) {
+               if (strcmp(pwd->pw_name, "root") == 0)
+                       errx(EX_DATAERR, "can't rename `root' account");
+               if (strcmp(pwd->pw_name, newname) != 0) {
+                       pwd->pw_name = pw_checkname(newname, 0);
+                       edited = true;
+               }
+       }
 
 
-       ch = name;
-       reject = 0;
-       if (gecos) {
-               /* See if the name is valid as a gecos (comment) field. */
-               badchars = ":!@";
-               showtype = "gecos field";
-       } else {
-               /* See if the name is valid as a userid or group. */
-               badchars = " ,\t:+&#%$^()!@~*?<>=|\\/\"";
-               showtype = "userid/group name";
-               /* Userids and groups can not have a leading '-'. */
-               if (*ch == '-')
-                       reject = 1;
+       if (id > 0 && pwd->pw_uid != id) {
+               pwd->pw_uid = id;
+               edited = true;
+               if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)
+                       errx(EX_DATAERR, "can't change uid of `root' account");
+               if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
+                       warnx("WARNING: account `%s' will have a uid of 0 "
+                           "(superuser access!)", pwd->pw_name);
        }
        }
-       if (!reject) {
-               while (*ch) {
-                       if (strchr(badchars, *ch) != NULL || *ch < ' ' ||
-                           *ch == 127) {
-                               reject = 1;
-                               break;
-                       }
-                       /* 8-bit characters are only allowed in GECOS fields */
-                       if (!gecos && (*ch & 0x80)) {
-                               reject = 1;
-                               break;
-                       }
-                       ch++;
+
+       if (grname && pwd->pw_uid != 0) {
+               grp = GETGRNAM(grname);
+               if (grp == NULL)
+                       grp = GETGRGID(pw_checkid(grname, GID_MAX));
+               if (grp->gr_gid != pwd->pw_gid) {
+                       pwd->pw_gid = grp->gr_gid;
+                       edited = true;
                }
        }
                }
        }
-       /*
-        * A `$' is allowed as the final character for userids and groups,
-        * mainly for the benefit of samba.
-        */
-       if (reject && !gecos) {
-               if (*ch == '$' && *(ch + 1) == '\0') {
-                       reject = 0;
-                       ch++;
+
+       if (password_days >= 0 && pwd->pw_change != password_days) {
+               pwd->pw_change = password_days;
+               edited = true;
+       }
+
+       if (expire_days >= 0 && pwd->pw_expire != expire_days) {
+               pwd->pw_expire = expire_days;
+               edited = true;
+       }
+
+       if (shell) {
+               shell = shell_path(cnf->shelldir, cnf->shells, shell);
+               if (shell == NULL)
+                       shell = "";
+               if (strcmp(shell, pwd->pw_shell) != 0) {
+                       pwd->pw_shell = shell;
+                       edited = true;
                }
        }
                }
        }
-       if (reject) {
-               snprintf(showch, sizeof(showch), (*ch >= ' ' && *ch < 127)
-                   ? "`%c'" : "0x%02x", *ch);
-               errx(EX_DATAERR, "invalid character %s at position %td in %s",
-                   showch, (ch - name), showtype);
+
+       if (class && strcmp(pwd->pw_class, class) != 0) {
+               pwd->pw_class = class;
+               edited = true;
        }
        }
-       if (!gecos && (ch - name) > LOGNAMESIZE)
-               errx(EX_DATAERR, "name too long `%s' (max is %d)", name,
-                   LOGNAMESIZE);
-       return (char *)name;
-}
 
 
+       if (homedir && strcmp(pwd->pw_dir, homedir) != 0) {
+               pwd->pw_dir = homedir;
+               if (fstatat(conf.rootfd, pwd->pw_dir, &st, 0) == -1) {
+                       if (!createhome)
+                               warnx("WARNING: home `%s' does not exist",
+                                   pwd->pw_dir);
+                       else
+                               docreatehome = true;
+               } else if (!S_ISDIR(st.st_mode)) {
+                       warnx("WARNING: home `%s' is not a directory",
+                           pwd->pw_dir);
+               }
+       }
 
 
-static void
-rmat(uid_t uid)
-{
-       DIR            *d = opendir("/var/at/jobs");
+       if (passwd && conf.fd == -1) {
+               lc = login_getpwclass(pwd);
+               if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
+                       warn("setting crypt(3) format");
+               login_close(lc);
+               pwd->pw_passwd = pw_password(cnf, pwd->pw_name, dryrun);
+               edited = true;
+       }
 
 
-       if (d != NULL) {
-               struct dirent  *e;
+       if (gecos && strcmp(pwd->pw_gecos, gecos) != 0) {
+               pwd->pw_gecos = gecos;
+               edited = true;
+       }
 
 
-               while ((e = readdir(d)) != NULL) {
-                       struct stat     st;
+       if (fd != -1)
+               edited = pw_set_passwd(pwd, fd, precrypted, true);
 
 
-                       if (strncmp(e->d_name, ".lock", 5) != 0 &&
-                           stat(e->d_name, &st) == 0 &&
-                           !S_ISDIR(st.st_mode) &&
-                           st.st_uid == uid) {
-                               char            tmp[MAXPATHLEN];
+       if (dryrun)
+               return (print_user(pwd, pretty, false));
 
 
-                               sprintf(tmp, "/usr/bin/atrm %s", e->d_name);
-                               system(tmp);
+       if (edited) /* Only updated this if required */
+               perform_chgpwent(name, pwd, nis ? nispasswd : NULL);
+       /* Now perform the needed changes concern groups */
+       if (groups != NULL) {
+               /* Delete User from groups using old name */
+               SETGRENT();
+               while ((grp = GETGRENT()) != NULL) {
+                       if (grp->gr_mem == NULL)
+                               continue;
+                       for (i = 0; grp->gr_mem[i] != NULL; i++) {
+                               if (strcmp(grp->gr_mem[i] , name) != 0)
+                                       continue;
+                               for (j = i; grp->gr_mem[j] != NULL ; j++)
+                                       grp->gr_mem[j] = grp->gr_mem[j+1];
+                               chggrent(grp->gr_name, grp);
+                               break;
                        }
                }
                        }
                }
-               closedir(d);
+               ENDGRENT();
+               /* Add the user to the needed groups */
+               for (i = 0; i < groups->sl_cur; i++) {
+                       grp = GETGRNAM(groups->sl_str[i]);
+                       grp = gr_add(grp, pwd->pw_name);
+                       if (grp == NULL)
+                               continue;
+                       chggrent(grp->gr_name, grp);
+                       free(grp);
+               }
        }
        }
-}
-
-static void
-rmopie(char const * name)
-{
-       static const char etcopie[] = "/etc/opiekeys";
-       FILE   *fp = fopen(etcopie, "r+");
-
-       if (fp != NULL) {
-               char    tmp[1024];
-               off_t   atofs = 0;
-               int     length = strlen(name);
-
-               while (fgets(tmp, sizeof tmp, fp) != NULL) {
-                       if (strncmp(name, tmp, length) == 0 && tmp[length]==' ') {
-                               if (fseek(fp, atofs, SEEK_SET) == 0) {
-                                       fwrite("#", 1, 1, fp);  /* Comment username out */
-                               }
+       /* In case of rename we need to walk over the different groups */
+       if (newname) {
+               SETGRENT();
+               while ((grp = GETGRENT()) != NULL) {
+                       if (grp->gr_mem == NULL)
+                               continue;
+                       for (i = 0; grp->gr_mem[i] != NULL; i++) {
+                               if (strcmp(grp->gr_mem[i], name) != 0)
+                                       continue;
+                               grp->gr_mem[i] = newname;
+                               chggrent(grp->gr_name, grp);
                                break;
                        }
                                break;
                        }
-                       atofs = ftell(fp);
                }
                }
-               /*
-                * If we got an error of any sort, don't update!
-                */
-               fclose(fp);
        }
        }
-}
 
 
+       /* go get a current version of pwd */
+       if (newname)
+               name = newname;
+       pwd = GETPWNAM(name);
+       if (pwd == NULL)
+               errx(EX_NOUSER, "user '%s' disappeared during update", name);
+       grp = GETGRGID(pwd->pw_gid);
+       pw_log(cnf, M_UPDATE, W_USER, "%s(%ju):%s(%ju):%s:%s:%s",
+           pwd->pw_name, (uintmax_t)pwd->pw_uid,
+           grp ? grp->gr_name : "unknown",
+           (uintmax_t)(grp ? grp->gr_gid : (uid_t)-1),
+           pwd->pw_gecos, pwd->pw_dir, pwd->pw_shell);
+
+       /*
+        * Let's create and populate the user's home directory. Note
+        * that this also `works' for editing users if -m is used, but
+        * existing files will *not* be overwritten.
+        */
+       if (PWALTDIR() != PWF_ALT && docreatehome && pwd->pw_dir &&
+           *pwd->pw_dir == '/' && pwd->pw_dir[1]) {
+               if (!skel)
+                       skel = cnf->dotdir;
+               if (homemode == 0)
+                       homemode = cnf->homemode;
+               create_and_populate_homedir(cnf, pwd, skel, homemode, true);
+       }
+
+       if (nis && nis_update() == 0)
+               pw_log(cnf, M_UPDATE, W_USER, "NIS maps updated");
+
+       return (EXIT_SUCCESS);
+}
A port of FreeBSDs pw for Darwin