From: Alejandro Colomar <alx@kernel.org>
Date: Sun, 12 Jul 2026 15:31:01 +0000 (+0200)
Subject: lib/, src/: is_valid_group_name(): Remove 'badnames' parameter
X-Git-Tag: 4.20.0-rc3~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f37beabd220afabfae044077cf1ad2824701429f;p=thirdparty%2Fshadow.git

lib/, src/: is_valid_group_name(): Remove 'badnames' parameter

We don't allow badnames in group names.

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

diff --git a/lib/chkname.c b/lib/chkname.c
index 2f80740db..fb1b6338b 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -111,7 +111,7 @@ is_valid_user_name(const char *name, bool badnames)
 
 
 bool
-is_valid_group_name(const char *name, bool badnames)
+is_valid_group_name(const char *name)
 {
 	/*
 	 * Arbitrary limit for group names.
@@ -124,7 +124,7 @@ is_valid_group_name(const char *name, bool badnames)
 		return false;
 	}
 
-	return is_valid_name(name, badnames);
+	return is_valid_name(name, false);
 }
 
 
diff --git a/lib/chkname.h b/lib/chkname.h
index 43766e66b..86ab711f5 100644
--- a/lib/chkname.h
+++ b/lib/chkname.h
@@ -27,7 +27,7 @@
 
 
 extern bool is_valid_user_name(const char *name, bool badnames);
-extern bool is_valid_group_name(const char *name, bool badnames);
+extern bool is_valid_group_name(const char *name);
 extern bool is_valid_upn(const char *name, bool badnames);
 
 #endif
diff --git a/src/groupadd.c b/src/groupadd.c
index 275371727..3c4ac8b13 100644
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -260,7 +260,7 @@ grp_update(void)
 static void
 check_new_name(void)
 {
-	if (!is_valid_group_name(group_name, false)) {
+	if (!is_valid_group_name(group_name)) {
 		fprintf(stderr, _("%s: '%s' is not a valid group name\n"),
 			Prog, group_name);
 
diff --git a/src/groupmod.c b/src/groupmod.c
index 5056faffe..0ad7a3073 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -382,7 +382,7 @@ check_new_name(void)
 		return;
 	}
 
-	if (!is_valid_group_name(group_newname, false)) {
+	if (!is_valid_group_name(group_newname)) {
 		fprintf(stderr,
 			_("%s: invalid group name '%s'\n"),
 			Prog, group_newname);
diff --git a/src/grpck.c b/src/grpck.c
index 76c191dd7..170980053 100644
--- a/src/grpck.c
+++ b/src/grpck.c
@@ -580,7 +580,7 @@ static void check_grp_file(bool *errors, bool *changed, const struct option_flag
 		/*
 		 * Check for invalid group names.  --marekm
 		 */
-		if (!is_valid_group_name(grp->gr_name, false)) {
+		if (!is_valid_group_name(grp->gr_name)) {
 			*errors = true;
 			printf (_("invalid group name '%s'\n"), grp->gr_name);
 		}
diff --git a/src/newgrp.c b/src/newgrp.c
index f7671ae4f..0f12d577b 100644
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -480,7 +480,7 @@ int main (int argc, char **argv)
 		 * not "newgrp".
 		 */
 		if ((argc > 0) && (argv[0][0] != '-')) {
-			if (!is_valid_group_name(argv[0], false)) {
+			if (!is_valid_group_name(argv[0])) {
 				fprintf (
 					stderr, _("%s: provided group is not a valid group name\n"),
 					Prog);
@@ -516,7 +516,7 @@ int main (int argc, char **argv)
 			usage ();
 			goto failure;
 		} else if (argv[0] != NULL) {
-			if (!is_valid_group_name(argv[0], false)) {
+			if (!is_valid_group_name(argv[0])) {
 				fprintf (
 					stderr, _("%s: provided group is not a valid group name\n"),
 					Prog);
diff --git a/src/newusers.c b/src/newusers.c
index ae4cca0a4..2baf1f567 100644
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -288,7 +288,7 @@ static int add_group (const char *name, const char *gid, gid_t *ngid, uid_t uid)
 	}
 
 	/* Check if this is a valid group name */
-	if (!is_valid_group_name(grent.gr_name, false)) {
+	if (!is_valid_group_name(grent.gr_name)) {
 		fprintf (stderr,
 		         _("%s: invalid group name '%s'\n"),
 		         Prog, grent.gr_name);