From: Alejandro Colomar <alx@kernel.org>
Date: Sat, 2 Sep 2023 12:15:43 +0000 (+0200)
Subject: lib/chkname.c: Use tmp variable to avoid a -Wsign-compare warning
X-Git-Tag: 4.14.4~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b775cbff9a8dc1b34a630dec493161e7a4cc716;p=thirdparty%2Fshadow.git

lib/chkname.c: Use tmp variable to avoid a -Wsign-compare warning

I used size_t because:

sysconf(3) can return -1 if the value is not supported, but then it can
only mean that there's no limit.  Having no limit is the same as having
a limit of SIZE_MAX (to which -1 is converted).

Signed-off-by: Alejandro Colomar <alx@kernel.org>
Cherry-picked-from: 6be85b0bafb5 ("lib/chkname.c: Use tmp variable to avoid a -Wsign-compare warning")
[alx: This is to cherry-pick the next commit without conflict]
Link: <https://github.com/shadow-maint/shadow/pull/801>
Link: <https://github.com/shadow-maint/shadow/pull/935>
Cc: Serge Hallyn <serge@hallyn.com>
Cc: Tobias Stoeckmann <tobias@stoeckmann.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/chkname.c b/lib/chkname.c
index 2b83361b8..d22e1b6b4 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -74,12 +74,14 @@ static bool is_valid_name (const char *name)
 
 bool is_valid_user_name (const char *name)
 {
+	size_t  maxlen;
+
 	/*
 	 * User names length are limited by the kernel
 	 */
-	if (strlen (name) > sysconf(_SC_LOGIN_NAME_MAX)) {
+	maxlen = sysconf(_SC_LOGIN_NAME_MAX);
+	if (strlen(name) > maxlen)
 		return false;
-	}
 
 	return is_valid_name (name);
 }