From owner-svn-src-stable-9@FreeBSD.ORG Wed Jul 10 14:16:40 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 40117639; Wed, 10 Jul 2013 14:16:40 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 31F3610A2; Wed, 10 Jul 2013 14:16:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6AEGeta061662; Wed, 10 Jul 2013 14:16:40 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6AEGeW6061661; Wed, 10 Jul 2013 14:16:40 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201307101416.r6AEGeW6061661@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 10 Jul 2013 14:16:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r253157 - stable/9/usr.sbin/pw X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2013 14:16:40 -0000 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);