emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/chage.c: When no shadow entry exist, thedefault sp_lstchg

Browse Source 
value should be -1 (no aging) rather than 0 (password must be
	changed).
	* src/chage.c: For password expiration and inactivity, indicate
	that the password must be changed when sp_lstchg is null rather
	than indicating that expiration and inactivity are not enabled.
This commit is contained in:
nekral-guest 2009-04-05 21:23:17 +00:00
parent 1ba2139d5c
commit 7585fa0fe9
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-04-04 Nicolas François <nicolas.francois@centraliens.net>
* src/chage.c: When no shadow entry exist, thedefault sp_lstchg
value should be -1 (no aging) rather than 0 (password must be
changed).
* src/chage.c: For password expiration and inactivity, indicate
that the password must be changed when sp_lstchg is null rather
than indicating that expiration and inactivity are not enabled.
2009-04-04 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/isexpired.c: Document the isexpired return value.

17
src/chage.c
View File

@ -322,8 +322,11 @@ static void list_fields (void)
* date plus the number of days the password is valid for.
*/
(void) fputs (_("Password expires\t\t\t\t\t: "), stdout);
if ((lastday <= 0) || (maxdays >= (10000 * (DAY / SCALE)))
|| (maxdays < 0)) {
if (lastday == 0) {
(void) puts (_("password must be changed"));
} else if ( (lastday < 0)
|| (maxdays >= (10000 * (DAY / SCALE)))
|| (maxdays < 0)) {
(void) puts (_("never"));
} else {
expires = changed + maxdays * SCALE;
@ -337,8 +340,12 @@ static void list_fields (void)
* active will be disabled.
*/
(void) fputs (_("Password inactive\t\t\t\t\t: "), stdout);
if ((lastday <= 0) || (inactdays < 0) ||
(maxdays >= (10000 * (DAY / SCALE))) || (maxdays < 0)) {
if (lastday == 0) {
(void) puts (_("password must be changed"));
} else if ( (lastday < 0)
|| (inactdays < 0)
|| (maxdays >= (10000 * (DAY / SCALE)))
|| (maxdays < 0)) {
(void) puts (_("never"));
} else {
expires = changed + (maxdays + inactdays) * SCALE;
@ -720,7 +727,7 @@ static void get_defaults (const struct spwd *sp)
mindays = -1;
}
if (!dflg) {
lastday = 0;
lastday = -1;
}
if (!Wflg) {
warndays = -1;