diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-07-17 01:32:29 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-07-17 01:32:29 +0000 |
| commit | f233ff62a96a2d0c369be8dcd504c169cbd60ffa (patch) | |
| tree | bf2472e6826b3095216f5fa242f1d5343c908527 /pw/pw_user.c | |
| parent | de7ca2d0664571507e6541388f8eff0638e12c76 (diff) | |
| parent | 78ed20543de7f07e92480d9d65202a25b4abcbcf (diff) | |
| download | pw-darwin-f233ff62a96a2d0c369be8dcd504c169cbd60ffa.tar.gz pw-darwin-f233ff62a96a2d0c369be8dcd504c169cbd60ffa.zip | |
IFC @253398
Diffstat (limited to 'pw/pw_user.c')
| -rw-r--r-- | pw/pw_user.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index 5f4d7a9..def238c 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -200,7 +200,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) strlcpy(dbuf, cnf->home, sizeof(dbuf)); p = dbuf; if (stat(dbuf, &st) == -1) { - while ((p = strchr(++p, '/')) != NULL) { + while ((p = strchr(p + 1, '/')) != NULL) { *p = '\0'; if (stat(dbuf, &st) == -1) { if (mkdir(dbuf, _DEF_DIRMODE) == -1) @@ -513,8 +513,6 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) time_t now = time(NULL); time_t expire = parse_date(now, arg->val); - if (now == expire) - errx(EX_DATAERR, "invalid password change date `%s'", arg->val); if (pwd->pw_change != expire) { pwd->pw_change = expire; edited = 1; @@ -533,8 +531,6 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) time_t now = time(NULL); time_t expire = parse_date(now, arg->val); - if (now == expire) - errx(EX_DATAERR, "invalid account expiry date `%s'", arg->val); if (pwd->pw_expire != expire) { pwd->pw_expire = expire; edited = 1; @@ -577,7 +573,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) lc = login_getpwclass(pwd); if (lc == NULL || - login_setcryptfmt(lc, "md5", NULL) == NULL) + login_setcryptfmt(lc, "sha512", NULL) == NULL) warn("setting crypt(3) format"); login_close(lc); pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name); |