Declare read-only arguments of run_part(s) const

run_part() and run_parts() do not modify their directory, name and
action arguments.
Also include the header in the implementation to provide the prototypes.

useradd.c:2495:59: warning: cast discards ‘const’ qualifier from pointer target type [-Wcast-qual]
 2495 |         if (run_parts ("/etc/shadow-maint/useradd-pre.d", (char*)user_name,
      |                                                           ^
useradd.c:2495:24: warning: passing argument 1 of ‘run_parts’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
 2495 |         if (run_parts ("/etc/shadow-maint/useradd-pre.d", (char*)user_name,
      |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from useradd.c:45:
../lib/run_part.h:2:22: note: expected ‘char *’ but argument is of type ‘const char *’
    2 | int run_parts (char *directory, char *name, char *action);
      |                ~~~~~~^~~~~~~~~
useradd.c:2496:25: warning: passing argument 3 of ‘run_parts’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
 2496 |                         "useradd")) {
      |                         ^~~~~~~~~

diff --git a/lib/run_part.c b/lib/run_part.c
index 1ce06be0476cfd149733aaaf08dc7fdc68848186..884bbefab217134407fb59897dcee515c9f848ef 100644 (file)
--- a/lib/run_part.c
+++ b/lib/run_part.c
@@ -8,9 +8,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <lib/prototypes.h>
+#include "run_part.h"
 #include "shadowlog_internal.h"
 
-int run_part (char *script_path, char *name, char *action)
+int run_part (char *script_path, const char *name, const char *action)
 {
        int pid;
        int wait_status;
@@ -39,7 +40,7 @@ int run_part (char *script_path, char *name, char *action)
        return (1);
 }
 
-int run_parts (char *directory, char *name, char *action)
+int run_parts (const char *directory, const char *name, const char *action)
 {
        struct dirent **namelist;
        int scanlist;

diff --git a/lib/run_part.h b/lib/run_part.h
index d3d80663767607dfe860d985e771a5586b91b766..0b68dbfc21068c90f62ef312fefda4e77dd7980a 100644 (file)
--- a/lib/run_part.h
+++ b/lib/run_part.h
@@ -1,2 +1,2 @@
-int run_part (char *script_path, char *name, char *action);
-int run_parts (char *directory, char *name, char *action);
+int run_part (char *script_path, const char *name, const char *action);
+int run_parts (const char *directory, const char *name, const char *action);

diff --git a/src/useradd.c b/src/useradd.c
index 456b9de5a7e1d80698881431f43f2020eb0ee763..34376fa5d407721d48de236b540501807859e365 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2492,7 +2492,7 @@ int main (int argc, char **argv)
            (!user_id || (user_id <= uid_max && user_id >= uid_min));
 #endif                         /* ENABLE_SUBIDS */
 
-       if (run_parts ("/etc/shadow-maint/useradd-pre.d", (char*)user_name,
+       if (run_parts ("/etc/shadow-maint/useradd-pre.d", user_name,
                        "useradd")) {
                exit(1);
        }
@@ -2715,7 +2715,7 @@ int main (int argc, char **argv)
                create_mail ();
        }
 
-       if (run_parts ("/etc/shadow-maint/useradd-post.d", (char*)user_name,
+       if (run_parts ("/etc/shadow-maint/useradd-post.d", user_name,
                        "useradd")) {
                exit(1);
        }