Fix typo preventing pw {user,group}next -C from working as expected

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

diff --git a/pw/pw_user.c b/pw/pw_user.c
index f1207e03f4c99198ef805e70a730727310d0172c..67186c3dc0338b533c4dc170dcd528aba9c94f0d 100644 (file)
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -31,13 +31,12 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>

-#include <sys/resource.h>
-#include <sys/time.h>

 #include <sys/types.h>
 
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
 #include <sys/types.h>
 
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>

+#include <errno.h>

 #include <fcntl.h>
 #include <grp.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <pwd.h>


@@ -84,12 +83,79 @@ static char *shell_path(char const * path, char *shells[], char *sh);
 static void    rmat(uid_t uid);
 static void    rmopie(char const * name);
 
 static void    rmat(uid_t uid);
 static void    rmopie(char const * name);
 

+static void
+mkdir_home_parents(int dfd, const char *dir)
+{
+       struct stat st;
+       char *dirs, *tmp;
+
+       if (*dir != '/')
+               errx(EX_DATAERR, "invalid base directory for home '%s'", dir);
+
+       dir++;
+
+       if (fstatat(dfd, dir, &st, 0) != -1) {
+               if (S_ISDIR(st.st_mode))
+                       return;
+               errx(EX_OSFILE, "root home `/%s' is not a directory", dir);
+       }
+
+       dirs = strdup(dir);
+       if (dirs == NULL)
+               errx(EX_UNAVAILABLE, "out of memory");
+
+       tmp = strrchr(dirs, '/');
+       if (tmp == NULL) {
+               free(dirs);
+               return;
+       }
+       tmp[0] = '\0';
+
+       /*
+        * 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(dirs, '/') == NULL) {
+               asprintf(&tmp, "usr/%s", dirs);
+               if (tmp == NULL)
+                       errx(EX_UNAVAILABLE, "out of memory");
+               if (mkdirat(dfd, tmp, _DEF_DIRMODE) != -1 || errno == EEXIST) {
+                       fchownat(dfd, tmp, 0, 0, 0);
+                       symlinkat(tmp, dfd, dirs);
+               }
+               free(tmp);
+       }
+       tmp = dirs;
+       if (fstatat(dfd, dirs, &st, 0) == -1) {
+               while ((tmp = strchr(tmp + 1, '/')) != NULL) {
+                       *tmp = '\0';
+                       if (fstatat(dfd, dirs, &st, 0) == -1) {
+                               if (mkdirat(dfd, dirs, _DEF_DIRMODE) == -1)
+                                       err(EX_OSFILE,  "'%s' (root home parent) is not a directory", dirs);
+                       }
+                       *tmp = '/';
+               }
+       }
+       if (fstatat(dfd, dirs, &st, 0) == -1) {
+               if (mkdirat(dfd, dirs, _DEF_DIRMODE) == -1)
+                       err(EX_OSFILE,  "'%s' (root home parent) is not a directory", dirs);
+               fchownat(dfd, dirs, 0, 0, 0);
+       }
+
+       free(dirs);
+}
+

 static void
 create_and_populate_homedir(struct userconf *cnf, struct passwd *pwd,
     const char *skeldir, mode_t homemode, bool update)
 {
        int skelfd = -1;
 
 static void
 create_and_populate_homedir(struct userconf *cnf, struct passwd *pwd,
     const char *skeldir, mode_t homemode, bool update)
 {
        int skelfd = -1;
 

+       /* Create home parents directories */
+       mkdir_home_parents(conf.rootfd, pwd->pw_dir);
+

        if (skeldir != NULL && *skeldir != '\0') {
                if (*skeldir == '/')
                        skeldir++;
        if (skeldir != NULL && *skeldir != '\0') {
                if (*skeldir == '/')
                        skeldir++;


@@ -206,7 +272,7 @@ pw_userlock(char *arg1, int mode)
        char *passtmp = NULL;
        char *name;
        bool locked = false;
        char *passtmp = NULL;
        char *name;
        bool locked = false;

-       uid_t id;
+       uid_t id = (uid_t)-1;

 
        if (geteuid() != 0)
                errx(EX_NOPERM, "you must be root");
 
        if (geteuid() != 0)
                errx(EX_NOPERM, "you must be root");


@@ -214,15 +280,19 @@ pw_userlock(char *arg1, int mode)
        if (arg1 == NULL)
                errx(EX_DATAERR, "username or id required");
 
        if (arg1 == NULL)
                errx(EX_DATAERR, "username or id required");
 

-       if (strspn(arg1, "0123456789") == strlen(arg1))
-               id = pw_checkid(arg1, UID_MAX);
-       else
-               name = arg1;
+       name = arg1;
+       if (arg1[strspn(name, "0123456789")] == '\0')
+               id = pw_checkid(name, UID_MAX);

 
 

-       pwd = (name != NULL) ? GETPWNAM(pw_checkname(name, 0)) : GETPWUID(id);
+       pwd = GETPWNAM(pw_checkname(name, 0));
+       if (pwd == NULL && id != (uid_t)-1) {
+               pwd = GETPWUID(id);
+               if (pwd != NULL)
+                       name = pwd->pw_name;
+       }

        if (pwd == NULL) {
        if (pwd == NULL) {

-               if (name == NULL)
-                       errx(EX_NOUSER, "no such uid `%ju'", (uintmax_t) id);
+               if (id == (uid_t)-1)
+                       errx(EX_NOUSER, "no such name or uid `%ju'", (uintmax_t) id);

                errx(EX_NOUSER, "no such user `%s'", name);
        }
 
                errx(EX_NOUSER, "no such user `%s'", name);
        }
 


@@ -570,7 +640,8 @@ pw_checkname(char *name, int gecos)
        }
        if (!reject) {
                while (*ch) {
        }
        if (!reject) {
                while (*ch) {

-                       if (strchr(badchars, *ch) != NULL || *ch < ' ' ||
+                       if (strchr(badchars, *ch) != NULL ||
+                           (!gecos && *ch < ' ') ||

                            *ch == 127) {
                                reject = 1;
                                break;
                            *ch == 127) {
                                reject = 1;
                                break;


@@ -671,7 +742,7 @@ pw_user_next(int argc, char **argv, char *name __unused)
        bool quiet = false;
        uid_t next;
 
        bool quiet = false;
        uid_t next;
 

-       while ((ch = getopt(argc, argv, "Cq")) != -1) {
+       while ((ch = getopt(argc, argv, "C:q")) != -1) {

                switch (ch) {
                case 'C':
                        cfg = optarg;
                switch (ch) {
                case 'C':
                        cfg = optarg;


@@ -700,7 +771,7 @@ pw_user_show(int argc, char **argv, char *arg1)
 {
        struct passwd *pwd = NULL;
        char *name = NULL;
 {
        struct passwd *pwd = NULL;
        char *name = NULL;

-       uid_t id = -1;
+       intmax_t id = -1;

        int ch;
        bool all = false;
        bool pretty = false;
        int ch;
        bool all = false;
        bool pretty = false;


@@ -709,7 +780,7 @@ pw_user_show(int argc, char **argv, char *arg1)
        bool quiet = false;
 
        if (arg1 != NULL) {
        bool quiet = false;
 
        if (arg1 != NULL) {

-               if (strspn(arg1, "0123456789") == strlen(arg1))
+               if (arg1[strspn(arg1, "0123456789")] == '\0')

                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;
                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;


@@ -738,7 +809,7 @@ pw_user_show(int argc, char **argv, char *arg1)
                case 'a':
                        all = true;
                        break;
                case 'a':
                        all = true;
                        break;

-               case 7:
+               case '7':

                        v7 = true;
                        break;
                }
                        v7 = true;
                        break;
                }


@@ -786,14 +857,14 @@ pw_user_del(int argc, char **argv, char *arg1)
        char home[MAXPATHLEN];
        const char *cfg = NULL;
        struct stat st;
        char home[MAXPATHLEN];
        const char *cfg = NULL;
        struct stat st;

-       uid_t id;
+       intmax_t id = -1;

        int ch, rc;
        bool nis = false;
        bool deletehome = false;
        bool quiet = false;
 
        if (arg1 != NULL) {
        int ch, rc;
        bool nis = false;
        bool deletehome = false;
        bool quiet = false;
 
        if (arg1 != NULL) {

-               if (strspn(arg1, "0123456789") == strlen(arg1))
+               if (arg1[strspn(arg1, "0123456789")] == '\0')

                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;
                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;


@@ -1124,7 +1195,7 @@ pw_user_add(int argc, char **argv, char *arg1)
                err(EXIT_FAILURE, "calloc()");
 
        if (arg1 != NULL) {
                err(EXIT_FAILURE, "calloc()");
 
        if (arg1 != NULL) {

-               if (strspn(arg1, "0123456789") == strlen(arg1))
+               if (arg1[strspn(arg1, "0123456789")] == '\0')

                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;
                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;


@@ -1423,8 +1494,9 @@ pw_user_mod(int argc, char **argv, char *arg1)
        int ch, fd = -1;
        size_t i, j;
        bool quiet, createhome, pretty, dryrun, nis, edited, docreatehome;
        int ch, fd = -1;
        size_t i, j;
        bool quiet, createhome, pretty, dryrun, nis, edited, docreatehome;

+       bool precrypted;

        mode_t homemode = 0;
        mode_t homemode = 0;

-       time_t expire_days, password_days, now, precrypted;
+       time_t expire_days, password_days, now;

 
        expire_days = password_days = -1;
        gecos = homedir = grname = name = newname = skel = shell =NULL;
 
        expire_days = password_days = -1;
        gecos = homedir = grname = name = newname = skel = shell =NULL;


@@ -1434,7 +1506,7 @@ pw_user_mod(int argc, char **argv, char *arg1)
        edited = docreatehome = false;
 
        if (arg1 != NULL) {
        edited = docreatehome = false;
 
        if (arg1 != NULL) {

-               if (strspn(arg1, "0123456789") == strlen(arg1))
+               if (arg1[strspn(arg1, "0123456789")] == '\0')

                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;
                        id = pw_checkid(arg1, UID_MAX);
                else
                        name = arg1;


@@ -1580,7 +1652,7 @@ pw_user_mod(int argc, char **argv, char *arg1)
                }
        }
 
                }
        }
 

-       if (id > 0 && pwd->pw_uid != id) {
+       if (id >= 0 && pwd->pw_uid != id) {

                pwd->pw_uid = id;
                edited = true;
                if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)
                pwd->pw_uid = id;
                edited = true;
                if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)


@@ -1627,6 +1699,7 @@ pw_user_mod(int argc, char **argv, char *arg1)
 
        if (homedir && strcmp(pwd->pw_dir, homedir) != 0) {
                pwd->pw_dir = homedir;
 
        if (homedir && strcmp(pwd->pw_dir, homedir) != 0) {
                pwd->pw_dir = homedir;

+               edited = true;

                if (fstatat(conf.rootfd, pwd->pw_dir, &st, 0) == -1) {
                        if (!createhome)
                                warnx("WARNING: home `%s' does not exist",
                if (fstatat(conf.rootfd, pwd->pw_dir, &st, 0) == -1) {
                        if (!createhome)
                                warnx("WARNING: home `%s' does not exist",


@@ -1644,6 +1717,8 @@ pw_user_mod(int argc, char **argv, char *arg1)
                if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
                        warn("setting crypt(3) format");
                login_close(lc);
                if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
                        warn("setting crypt(3) format");
                login_close(lc);

+               cnf->default_password = boolean_val(passwd,
+                   cnf->default_password);

                pwd->pw_passwd = pw_password(cnf, pwd->pw_name, dryrun);
                edited = true;
        }
                pwd->pw_passwd = pw_password(cnf, pwd->pw_name, dryrun);
                edited = true;
        }