Remove a death threat from the FreeBSD sources

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

diff --git a/pw/pw_user.c b/pw/pw_user.c
index 30a2749ec917ed191414ca3d5e1f6d369cc71792..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>
@@ -744,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;
@@ -1317,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)
@@ -1654,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)
@@ -1719,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;