Remove usage of _WITH_GETLINE from usr.sbin

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

diff --git a/pw/pw_user.c b/pw/pw_user.c
index 345f642a73d05547a2fb86aa718f6afa3c4c1444..75e7fb6e5c8887127e372b50280ec64193c072ea 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>
@@ -274,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");
@@ -282,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);
        }
 
@@ -638,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;
@@ -739,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;
@@ -1312,7 +1315,7 @@ pw_user_add(int argc, char **argv, char *arg1)
 
        mix_config(cmdcnf, cnf);
        if (default_passwd)
-               cmdcnf->default_password = boolean_val(default_passwd,
+               cmdcnf->default_password = passwd_val(default_passwd,
                    cnf->default_password);
        if (genconf) {
                if (name != NULL)
@@ -1649,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)
@@ -1714,7 +1717,7 @@ 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);
-               cnf->default_password = boolean_val(passwd,
+               cnf->default_password = passwd_val(passwd,
                    cnf->default_password);
                pwd->pw_passwd = pw_password(cnf, pwd->pw_name, dryrun);
                edited = true;