svn commit: r253157 - stable/9/usr.sbin/pw

[Dag-Erling Smørgrav]

Author: des
Date: Wed Jul 10 14:16:39 2013
New Revision: 253157
URL: http://svnweb.freebsd.org/changeset/base/253157

Log:
  MFH (r252556): allow setting expiry to current date / time
  MFH (r252688): fall back to sha512 if passwd_format is not set

Modified:
  stable/9/usr.sbin/pw/pw_user.c
Directory Properties:
  stable/9/usr.sbin/pw/   (props changed)

Modified: stable/9/usr.sbin/pw/pw_user.c
==============================================================================
--- stable/9/usr.sbin/pw/pw_user.c	Wed Jul 10 14:14:48 2013	(r253156)
+++ stable/9/usr.sbin/pw/pw_user.c	Wed Jul 10 14:16:39 2013	(r253157)
@@ -494,8 +494,6 @@ pw_user(struct userconf * cnf, int mode,
 				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;
@@ -514,8 +512,6 @@ pw_user(struct userconf * cnf, int mode,
 				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;
@@ -558,7 +554,7 @@ pw_user(struct userconf * cnf, int mode,
 
 			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);