lib-master: Add master_service_settings_input.extra_modules

This allows specifying more than one module.

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index eded8d139bd1cb38e0c63fb2e9ddfb41db38b5c5..d9c70eb333e612681e59297fc3421f0a5b4e759f 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -216,11 +216,18 @@ master_service_exec_config(struct master_service *service,
        if (input->module != NULL) {
                strarr_push(&conf_argv, "-m");
                strarr_push(&conf_argv, input->module);
-               if (service->want_ssl_settings) {
+       }
+       if (input->extra_modules != NULL) {
+               for (unsigned int i = 0; input->extra_modules[i] != NULL; i++) {
                        strarr_push(&conf_argv, "-m");
-                       strarr_push(&conf_argv, "ssl");
+                       strarr_push(&conf_argv, input->extra_modules[i]);
                }
        }
+       if (service->want_ssl_settings &&
+           (input->module != NULL || input->extra_modules != NULL)) {
+               strarr_push(&conf_argv, "-m");
+               strarr_push(&conf_argv, "ssl");
+       }
        if (input->parse_full_config)
                strarr_push(&conf_argv, "-p");
 

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index b8d75b442763f473c6b3310e4c3b0684db889a72..4fe281f4148b6e1cb49de2247812efa336a5fd8d 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -41,7 +41,10 @@ struct master_service_settings_input {
        bool use_sysexits;
        bool parse_full_config;
 
+       /* Either/both module and extra_modules can be set. Usually just one
+          is needed, so module is simpler to set. */
        const char *module;
+       const char *const *extra_modules;
        const char *service;
        const char *username;
        struct ip_addr local_ip, remote_ip;