VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src/: Use DAY_TO_STR() instead of its pattern

Browse Source 
Cc: Tobias Stoeckmann <tobias@stoeckmann.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-01-29 15:19:44 +01:00
committed by Serge Hallyn
parent 19edb06fd2
commit 82e28ad534
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/chage.c
View File

@@ -181,11 +181,10 @@ static int new_fields (void)
return 0;
}
if (-1 == lstchgdate || lstchgdate > LONG_MAX / DAY) {
strcpy (buf, "-1");
} else {
date_to_str (sizeof(buf), buf, lstchgdate * DAY);
}
if (-1 == lstchgdate || lstchgdate > LONG_MAX / DAY)
strcpy(buf, "-1");
else
DAY_TO_STR(buf, lstchgdate);
change_field (buf, sizeof buf, _("Last Password Change (YYYY-MM-DD)"));
@@ -212,11 +211,10 @@ static int new_fields (void)
return 0;
}
if (-1 == expdate || LONG_MAX / DAY < expdate) {
strcpy (buf, "-1");
} else {
date_to_str (sizeof(buf), buf, expdate * DAY);
}
if (-1 == expdate || LONG_MAX / DAY < expdate)
strcpy(buf, "-1");
else
DAY_TO_STR(buf, expdate);
change_field (buf, sizeof buf,
_("Account Expiration Date (YYYY-MM-DD)"));

2
src/passwd.c
View File

@@ -453,7 +453,7 @@ static void print_status (const struct passwd *pw)
sp = prefix_getspnam (pw->pw_name); /* local, no need for xprefix_getspnam */
if (NULL != sp) {
date_to_str (sizeof(date), date, sp->sp_lstchg * DAY),
DAY_TO_STR(date, sp->sp_lstchg),
(void) printf ("%s %s %s %ld %ld %ld %ld\n",
pw->pw_name,
pw_status (sp->sp_pwdp),

5
src/usermod.c
View File

@@ -586,8 +586,9 @@ static void new_spent (struct spwd *spent)
if (eflg) {
/* log dates rather than numbers of days. */
char new_exp[16], old_exp[16];
date_to_str (sizeof(new_exp), new_exp, user_newexpire * DAY);
date_to_str (sizeof(old_exp), old_exp, user_expire * DAY);
DAY_TO_STR(new_exp, user_newexpire);
DAY_TO_STR(old_exp, user_expire);
#ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"changing expiration date",