From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 9 Jan 2024 20:22:30 +0000 (+0100)
Subject: src/usermod.c: Simplify, by calling a2sl() instead of str2sl()
X-Git-Tag: 4.17.0-rc1~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0464c1abf18bef0da331e66369968e6d27df4a57;p=thirdparty%2Fshadow.git

src/usermod.c: Simplify, by calling a2sl() instead of str2sl()

Reviewed-by: "Serge E. Hallyn" <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/src/usermod.c b/src/usermod.c
index f80c056fd..321ab383b 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -36,7 +36,6 @@
 #include "alloc/x/xmalloc.h"
 #include "atoi/a2i.h"
 #include "atoi/getnum.h"
-#include "atoi/str2i.h"
 #include "chkname.h"
 #include "defines.h"
 #include "faillog.h"
@@ -970,7 +969,8 @@ static void grp_update (void)
  *	values that the user will be created with accordingly. The values
  *	are checked for sanity.
  */
-static void process_flags (int argc, char **argv)
+static void
+process_flags(int argc, char **argv)
 {
 	struct stat st;
 	bool anyflag = false;
@@ -1067,8 +1067,9 @@ static void process_flags (int argc, char **argv)
 				eflg = true;
 				break;
 			case 'f':
-				if (   (str2sl(&user_newinactive, optarg) == -1)
-				    || (user_newinactive < -1)) {
+				if (a2sl(&user_newinactive, optarg, NULL, 0, -1, LONG_MAX)
+				    == -1)
+				{
 					fprintf (stderr,
 					         _("%s: invalid numeric argument '%s'\n"),
 					         Prog, optarg);