* src/passwd.c: Add missing cast.

* lib/commonio.c: Avoid multiple statements per line.
	* lib/commonio.c: Ignore fclose return value when the file was
	open read only or was not changed, or if an error is already
	reported.
This commit is contained in:
nekral-guest
2011-11-19 22:00:00 +00:00
parent 4049c0e69e
commit bd4a6c9966
3 changed files with 14 additions and 6 deletions

View File

@@ -410,9 +410,11 @@ static void check_password (const struct passwd *pw, const struct spwd *sp)
* Passwords may only be changed after sp_min time is up.
*/
if (sp->sp_lstchg > 0) {
time_t last, ok;
last = sp->sp_lstchg * SCALE;
ok = last + (sp->sp_min > 0 ? sp->sp_min * SCALE : 0);
time_t ok;
ok = (time_t) sp->sp_lstchg * SCALE;
if (sp->sp_min > 0) {
ok += (time_t) sp->sp_min * SCALE;
}
if (now < ok) {
(void) fprintf (stderr,