From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 2 Dec 2024 12:23:49 +0000 (+0100)
Subject: lib/chkname.c: is_valid_name(): Use streq() instead of its pattern
X-Git-Tag: 4.17.3~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a24e8848213120400de6e0a94908faeb08a08a1;p=thirdparty%2Fshadow.git

lib/chkname.c: is_valid_name(): Use streq() instead of its pattern

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/chkname.c b/lib/chkname.c
index bee2e6bd7..b2fc0b88a 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -73,9 +73,9 @@ is_valid_name(const char *name)
          */
 	int numeric;
 
-	if ('\0' == *name ||
-	    ('.' == *name && (('.' == name[1] && '\0' == name[2]) ||
-			      '\0' == name[1])) ||
+	if (streq(name, "") ||
+	    streq(name, ".") ||
+	    streq(name, "..") ||
 	    !((*name >= 'a' && *name <= 'z') ||
 	      (*name >= 'A' && *name <= 'Z') ||
 	      (*name >= '0' && *name <= '9') ||
@@ -95,7 +95,7 @@ is_valid_name(const char *name)
 		      *name == '_' ||
 		      *name == '.' ||
 		      *name == '-' ||
-		      (*name == '$' && name[1] == '\0')
+		      streq(name, "$")
 		     ))
 		{
 			errno = EINVAL;