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

lib/sgetspent.c: sgetspent(): Simplify, by calling a2sl() instead of str2sl()

Browse Source 
Reviewed-by: "Serge E. Hallyn" <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-01-09 20:04:43 +01:00
parent 03521bccce
commit 326bdfe70b
1 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sgetspent.c
+15 -27
View File
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <string.h>
#include "atoi/a2i.h"
#include "atoi/str2i.h"
#include "prototypes.h"
#include "shadowlog_internal.h"
@@ -83,34 +84,28 @@ sgetspent(const char *string)
* incorrectly formatted number.
*/
if (fields[2][0] == '\0') {
if (fields[2][0] == '\0')
spwd.sp_lstchg = -1;
} else if ( (str2sl(&spwd.sp_lstchg, fields[2]) == -1)
|| (spwd.sp_lstchg < 0)) {
else if (a2sl(&spwd.sp_lstchg, fields[2], NULL, 0, 0, LONG_MAX) == -1)
return NULL;
}
/*
* Get the minimum period between password changes.
*/
if (fields[3][0] == '\0') {
if (fields[3][0] == '\0')
spwd.sp_min = -1;
} else if ( (str2sl(&spwd.sp_min, fields[3]) == -1)
|| (spwd.sp_min < 0)) {
else if (a2sl(&spwd.sp_min, fields[3], NULL, 0, 0, LONG_MAX) == -1)
return NULL;
}
/*
* Get the maximum number of days a password is valid.
*/
if (fields[4][0] == '\0') {
if (fields[4][0] == '\0')
spwd.sp_max = -1;
} else if ( (str2sl(&spwd.sp_max, fields[4]) == -1)
|| (spwd.sp_max < 0)) {
else if (a2sl(&spwd.sp_max, fields[4], NULL, 0, 0, LONG_MAX) == -1)
return NULL;
}
/*
* If there are only OFIELDS fields (this is a SVR3.2 /etc/shadow
@@ -130,47 +125,40 @@ sgetspent(const char *string)
* Get the number of days of password expiry warning.
*/
if (fields[5][0] == '\0') {
if (fields[5][0] == '\0')
spwd.sp_warn = -1;
} else if ( (str2sl(&spwd.sp_warn, fields[5]) == -1)
|| (spwd.sp_warn < 0)) {
else if (a2sl(&spwd.sp_warn, fields[5], NULL, 0, 0, LONG_MAX) == -1)
return NULL;
}
/*
* Get the number of days of inactivity before an account is
* disabled.
*/
if (fields[6][0] == '\0') {
if (fields[6][0] == '\0')
spwd.sp_inact = -1;
} else if ( (str2sl(&spwd.sp_inact, fields[6]) == -1)
|| (spwd.sp_inact < 0)) {
else if (a2sl(&spwd.sp_inact, fields[6], NULL, 0, 0, LONG_MAX) == -1)
return NULL;
}
/*
* Get the number of days after the epoch before the account is
* set to expire.
*/
if (fields[7][0] == '\0') {
if (fields[7][0] == '\0')
spwd.sp_expire = -1;
} else if ( (str2sl(&spwd.sp_expire, fields[7]) == -1)
|| (spwd.sp_expire < 0)) {
else if (a2sl(&spwd.sp_expire, fields[7], NULL, 0, 0, LONG_MAX) == -1)
return NULL;
}
/*
* This field is reserved for future use. But it isn't supposed
* to have anything other than a valid integer in it.
*/
if (fields[8][0] == '\0') {
if (fields[8][0] == '\0')
spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
} else if (str2ul(&spwd.sp_flag, fields[8]) == -1) {
else if (str2ul(&spwd.sp_flag, fields[8]) == -1)
return NULL;
}
return (&spwd);
}