PREFIX stuff

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

diff --git a/pw/pw_user.c b/pw/pw_user.c
index 148239ebd2b5f8a9e48af738b6bf34125cf60482..02a6a2442d696755a24e98421e12cc7ac718e531 100644 (file)
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -36,6 +36,7 @@ static const char rcsid[] =
 #include <sys/types.h>
 
 #include <assert.h>
+#include <crypt.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
@@ -69,7 +70,6 @@ static struct passwd fakeuser = {
        "User &",
        "/nonexistent",
        "/bin/sh",
-       0,
        0
 };
 
@@ -482,27 +482,17 @@ pw_shellpolicy(struct userconf * cnf)
        return shell_path(cnf->shelldir, cnf->shells, cnf->shell_default);
 }
 
-#define        SALTSIZE        32
 
 static char const chars[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ./";
 
 char *
 pw_pwcrypt(char *password)
 {
-       int             i;
-       char            salt[SALTSIZE + 1];
        char            *cryptpw;
        static char     buf[256];
        size_t          pwlen;
 
-       /*
-        * Calculate a salt value
-        */
-       for (i = 0; i < SALTSIZE; i++)
-               salt[i] = chars[arc4random_uniform(sizeof(chars) - 1)];
-       salt[SALTSIZE] = '\0';
-
-       cryptpw = crypt(password, salt);
+       cryptpw = crypt(password, crypt_gensalt("$6$", 0, chars, strlen(chars)));
        if (cryptpw == NULL)
                errx(EX_CONFIG, "crypt(3) failure");
        pwlen = strlcpy(buf, cryptpw, sizeof(buf));
@@ -589,7 +579,7 @@ print_user(struct passwd * pwd, bool pretty, bool v7)
        }
        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)
+       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"
@@ -712,24 +702,24 @@ rmopie(char const * name)
 {
        char tmp[1014];
        FILE *fp;
-       int fd;
        size_t len;
-       off_t   atofs = 0;
-       
+       long atofs;
+       int fd;
+
        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) {
+       for (atofs = 0; fgets(tmp, sizeof(tmp), fp) != NULL && atofs >= 0;
+           atofs = ftell(fp)) {
                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!
@@ -918,24 +908,15 @@ pw_user_del(int argc, char **argv, char *arg1)
                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);
-               }
-       }
-
        id = pwd->pw_uid;
        if (name == NULL)
                name = pwd->pw_name;
 
-       if (strcmp(pwd->pw_name, "root") == 0)
-               errx(EX_DATAERR, "cannot remove user 'root'");
+       char *system_users[30] = {"nobody", "root", "mobile", "daemon", "_ftp", "_networkd", "_wireless", "_installd", "_neagent", "_ifccd", "_securityd", "_mdnsresponder", "_sshd", "_unknown", "_distnote", "_astris", "_ondemand", "_findmydevice", "_datadetectors", "_captiveagent", "_analyticsd", "_timed", "_gpsd", "_reportmemoryexception", "_diskimagesiod", "_logd", "_iconservices", "_fud", "_knowledgegraphd", "_coreml"};
+       for (int i = 0; i < 30; i++) {
+               if (strcmp(pwd->pw_name, system_users[i]) == 0)
+                       errx(EX_DATAERR, "cannot remove user '%s'", system_users[i]);
+       }
 
        /* Remove opie record from /etc/opiekeys */
        if (PWALTDIR() != PWF_ALT)
@@ -1015,7 +996,6 @@ pw_user_del(int argc, char **argv, char *arg1)
 
        /* 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"
@@ -1386,6 +1366,8 @@ pw_user_add(int argc, char **argv, char *arg1)
        pwd->pw_gid = pw_gidpolicy(cnf, grname, pwd->pw_name,
            (gid_t) pwd->pw_uid, dryrun);
 
+       split_groups(&cmdcnf->groups, grname);
+
        /* cmdcnf->password_days and cmdcnf->expire_days hold unixtime here */
        if (cmdcnf->password_days > 0)
                pwd->pw_change = cmdcnf->password_days;
@@ -1658,18 +1640,6 @@ pw_user_mod(int argc, char **argv, char *arg1)
        if (nis && nispasswd == NULL)
                nispasswd = cnf->nispasswd;
 
-       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);
-               }
-       }
-
        if (newname) {
                if (strcmp(pwd->pw_name, "root") == 0)
                        errx(EX_DATAERR, "can't rename `root' account");