master: Removed unused process_exec(extra_args) parameter

Removes unnecessarily complicated code marked with @UNSAFE.

diff --git a/src/master/common.h b/src/master/common.h
index c1b7637d913d14b26ff7f1e80bbda79b3cc69c39..6f228a5f01dc214b3d38941aac224c3c372668fe 100644 (file)
--- a/src/master/common.h
+++ b/src/master/common.h
@@ -13,8 +13,7 @@ extern int global_master_dead_pipe_fd[2];
 extern struct service_list *services;
 extern bool startup_finished;
 
-void process_exec(const char *cmd, const char *extra_args[])
-       ATTR_NORETURN ATTR_NULL(2);
+void process_exec(const char *cmd) ATTR_NORETURN;
 
 int get_uidgid(const char *user, uid_t *uid_r, gid_t *gid_r,
               const char **error_r);

diff --git a/src/master/main.c b/src/master/main.c
index c2aaf4c2fbea975c5d643fcfd18a4a153987a02c..39f98a7430c9b00ec9ce78479a202307c716b7ad 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -58,27 +58,13 @@ static const struct setting_parser_info *set_roots[] = {
        NULL
 };
 
-void process_exec(const char *cmd, const char *extra_args[])
+void process_exec(const char *cmd)
 {
        const char *executable, *p, **argv;
 
        argv = t_strsplit(cmd, " ");
        executable = argv[0];
 
-       if (extra_args != NULL) {
-               unsigned int count1, count2;
-               const char **new_argv;
-
-               /* @UNSAFE */
-               count1 = str_array_length(argv);
-               count2 = str_array_length(extra_args);
-               new_argv = t_new(const char *, count1 + count2 + 1);
-               memcpy(new_argv, argv, sizeof(const char *) * count1);
-               memcpy(new_argv + count1, extra_args,
-                      sizeof(const char *) * count2);
-               argv = new_argv;
-       }
-
        /* hide the path, it's ugly */
        p = strrchr(argv[0], '/');
        if (p != NULL) argv[0] = p+1;

diff --git a/src/master/service-process.c b/src/master/service-process.c
index c70d9c10ef0795fad610d9ecbb6b273932b7b384..3a1d0266684e6000f69be3e3072a30e288810ba8 100644 (file)
--- a/src/master/service-process.c
+++ b/src/master/service-process.c
@@ -323,7 +323,7 @@ struct service_process *service_process_create(struct service *service)
                service_reopen_inet_listeners(service);
                service_dup_fds(service);
                drop_privileges(service);
-               process_exec(service->executable, NULL);
+               process_exec(service->executable);
        }
        i_assert(hash_table_lookup(service_pids, POINTER_CAST(pid)) == NULL);