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 2f80740db80fc1cfdb89ac1c24cf2152339cac9a..fb1b6338bad4ab9da0b55adc1f913638211494bc 100644 (file)
--- 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 43766e66ba63ff916af847d01d20a409b668216a..86ab711f5b3d88d08cf7df9bf94d78a75a61b5ef 100644 (file)
--- 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 27537172752f536091b2c1dcd5ddd0f2501f62fb..3c4ac8b13c2dda1fb9540d65fe6e8ad57ca30e38 100644 (file)
--- 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 5056faffe76e97df415527d52d7fa509784038fa..0ad7a30730c586481403830c149f503ccf211f68 100644 (file)
--- 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 76c191dd75c5671e4f60af6ea899ac52ced12222..170980053f134634b4d4d9641458322332297d65 100644 (file)
--- 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 f7671ae4fef490e029a933160bf24d9509699130..0f12d577bbfa1088d77947a32a8a718f456bb7c6 100644 (file)
--- 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 ae4cca0a455eb2f46bc0c0f6e7d3550ec86565f5..2baf1f567c1eaac9a3af9e5e0c4176daa9afe998 100644 (file)
--- 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);