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 1af8f814deea96a33cc8be47d35c381d09cda4d2..67186c3dc0338b533c4dc170dcd528aba9c94f0d 100644 (file)
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -31,8 +31,6 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/resource.h>
-#include <sys/time.h>
 #include <sys/types.h>
 
 #include <ctype.h>
@@ -107,8 +105,10 @@ mkdir_home_parents(int dfd, const char *dir)
                errx(EX_UNAVAILABLE, "out of memory");
 
        tmp = strrchr(dirs, '/');
-       if (tmp == NULL)
+       if (tmp == NULL) {
+               free(dirs);
                return;
+       }
        tmp[0] = '\0';
 
        /*
@@ -272,7 +272,7 @@ pw_userlock(char *arg1, int mode)
        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");
@@ -280,15 +280,19 @@ pw_userlock(char *arg1, int mode)
        if (arg1 == NULL)
                errx(EX_DATAERR, "username or id required");
 
-       if (arg1[strspn(arg1, "0123456789")] == '\0')
-               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 (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);
        }
 
@@ -636,7 +640,8 @@ pw_checkname(char *name, int gecos)
        }
        if (!reject) {
                while (*ch) {
-                       if (strchr(badchars, *ch) != NULL || *ch < ' ' ||
+                       if (strchr(badchars, *ch) != NULL ||
+                           (!gecos && *ch < ' ') ||
                            *ch == 127) {
                                reject = 1;
                                break;
@@ -737,7 +742,7 @@ pw_user_next(int argc, char **argv, char *name __unused)
        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;
@@ -1647,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)