Author: eugen
Date: Fri Dec 22 18:15:34 2017
New Revision: 327091
URL: https://svnweb.freebsd.org/changeset/base/327091
Log:
MFC r326872: fix expiration arithmetic after r326738 and MFC.
Approved by: mav (mentor)
Modified:
stable/10/usr.sbin/pw/pw_user.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/pw/pw_user.c
==============================================================================
--- stable/10/usr.sbin/pw/pw_user.c Fri Dec 22 18:14:55 2017
(r327090)
+++ stable/10/usr.sbin/pw/pw_user.c Fri Dec 22 18:15:34 2017
(r327091)
@@ -1385,11 +1385,12 @@ pw_user_add(int argc, char **argv, char *arg1)
pwd->pw_uid = pw_uidpolicy(cmdcnf, id);
pwd->pw_gid = pw_gidpolicy(cnf, grname, pwd->pw_name,
(gid_t) pwd->pw_uid, dryrun);
-
+
+ /* cmdcnf->password_days and cmdcnf->expire_days hold unixtime here */
if (cmdcnf->password_days > 0)
- pwd->pw_change = now + cmdcnf->password_days * 86400L;
+ pwd->pw_change = cmdcnf->password_days;
if (cmdcnf->expire_days > 0)
- pwd->pw_expire = now + cmdcnf->expire_days * 86400L;
+ pwd->pw_expire = cmdcnf->expire_days;
pwd->pw_dir = pw_homepolicy(cmdcnf, homedir, pwd->pw_name);
pwd->pw_shell = pw_shellpolicy(cmdcnf);
@@ -1523,9 +1524,9 @@ pw_user_mod(int argc, char **argv, char *arg1)
bool quiet, createhome, pretty, dryrun, nis, edited;
bool precrypted;
mode_t homemode = 0;
- time_t expire_days, password_days, now;
+ time_t expire_time, password_time, now;
- expire_days = password_days = -1;
+ expire_time = password_time = -1;
gecos = homedir = grname = name = newname = skel = shell =NULL;
passwd = NULL;
class = nispasswd = NULL;
@@ -1561,10 +1562,10 @@ pw_user_mod(int argc, char **argv, char *arg1)
homedir = optarg;
break;
case 'e':
- expire_days = parse_date(now, optarg);
+ expire_time = parse_date(now, optarg);
break;
case 'p':
- password_days = parse_date(now, optarg);
+ password_time = parse_date(now, optarg);
break;
case 'g':
group_from_name_or_id(optarg);
@@ -1699,13 +1700,13 @@ pw_user_mod(int argc, char **argv, char *arg1)
}
- if (password_days >= 0) {
- pwd->pw_change = now + password_days * 86400L;
+ if (password_time >= 0 && pwd->pw_change != password_time) {
+ pwd->pw_change = password_time;
edited = true;
}
- if (expire_days >= 0) {
- pwd->pw_expire = now + expire_days * 86400L;
+ if (expire_time >= 0 && pwd->pw_expire != expire_time) {
+ pwd->pw_expire = expire_time;
edited = true;
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
