tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do shadow expiry calcs using "long long". 

Coverity flags these as potentially not 64bit time_t safe so use
long long for the calculations and debug output.  ok djm@
This commit is contained in:
Darren Tucker 2023-02-27 17:28:59 +11:00
parent 01dbeb3084
commit b0fd60a9de
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
auth-shadow.c
View File

@ -56,13 +56,13 @@ int
auth_shadow_acctexpired(struct spwd *spw) auth_shadow_acctexpired(struct spwd *spw)
{ {
time_t today; time_t today;
int daysleft; long long daysleft;
int r; int r;
today = time(NULL) / DAY; today = time(NULL) / DAY;
daysleft = spw->sp_expire - today; daysleft = spw->sp_expire - today;
debug3("%s: today %d sp_expire %d days left %d", __func__, (int)today, debug3("%s: today %lld sp_expire %lld days left %lld", __func__,
(int)spw->sp_expire, daysleft); (long long)today, (long long)spw->sp_expire, daysleft);
if (spw->sp_expire == -1) { if (spw->sp_expire == -1) {
debug3("account expiration disabled"); debug3("account expiration disabled");
@ -70,9 +70,9 @@ auth_shadow_acctexpired(struct spwd *spw)
logit("Account %.100s has expired", spw->sp_namp); logit("Account %.100s has expired", spw->sp_namp);
return 1; return 1;
} else if (daysleft <= spw->sp_warn) { } else if (daysleft <= spw->sp_warn) {
debug3("account will expire in %d days", daysleft); debug3("account will expire in %lld days", daysleft);
if ((r = sshbuf_putf(loginmsg, if ((r = sshbuf_putf(loginmsg,
"Your account will expire in %d day%s.\n", daysleft, "Your account will expire in %lld day%s.\n", daysleft,
daysleft == 1 ? "" : "s")) != 0) daysleft == 1 ? "" : "s")) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
} }