From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 5 Feb 2024 11:40:51 +0000 (+0100)
Subject: lib/chkname.c: is_valid_user_name(): Avoid a cast
X-Git-Tag: 4.15.0-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f22ca217cdcdde5eae610b2fd982a93252c30f86;p=thirdparty%2Fshadow.git

lib/chkname.c: is_valid_user_name(): Avoid a cast

By using a temporary vairable, we can remove a cast.

Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com>
Cc: Tobias Stoeckmann <tobias@stoeckmann.org>
Cc: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/chkname.c b/lib/chkname.c
index 79fa29c36..fbd6ba889 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -76,17 +76,21 @@ static bool is_valid_name (const char *name)
 bool
 is_valid_user_name(const char *name)
 {
-	long  maxsize;
+	long    conf;
+	size_t  maxsize;
 
 	errno = 0;
-	maxsize = sysconf(_SC_LOGIN_NAME_MAX);
-	if (maxsize == -1 && errno != 0)
+	conf = sysconf(_SC_LOGIN_NAME_MAX);
+
+	if (conf == -1 && errno != 0)
 		maxsize = LOGIN_NAME_MAX;
+	else
+		maxsize = conf;
 
-	if (strlen(name) >= (size_t)maxsize)
+	if (strlen(name) >= maxsize)
 		return false;
 
-	return is_valid_name (name);
+	return is_valid_name(name);
 }