doveadm: Remove global service_set variable

Use master_service_get_service_settings() instead.

diff --git a/src/doveadm/doveadm-instance.c b/src/doveadm/doveadm-instance.c
index 63b9b6a820a8a34a987102b8d7bf8a852a4b4eb6..69a336e0272f7f8e3bf8ce0619b72d5beccf6ba7 100644 (file)
--- a/src/doveadm/doveadm-instance.c
+++ b/src/doveadm/doveadm-instance.c
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "master-instance.h"
+#include "master-service.h"
 #include "master-service-settings.h"
 #include "doveadm.h"
 #include "doveadm-print.h"
@@ -64,7 +65,7 @@ static void cmd_instance_list(struct doveadm_cmd_context *cctx)
                doveadm_print_header_simple("running");
        }
 
-       instance_path = t_strconcat(service_set->state_dir,
+       instance_path = t_strconcat(master_service_get_service_settings(master_service)->state_dir,
                                    "/"MASTER_INSTANCE_FNAME, NULL);
        list = master_instance_list_init(instance_path);
        iter = master_instance_list_iterate_init(list);
@@ -100,7 +101,7 @@ static void cmd_instance_remove(struct doveadm_cmd_context *cctx)
        if (!doveadm_cmd_param_str(cctx, "name", &name))
                instance_cmd_help(cctx->cmd);
 
-       instance_path = t_strconcat(service_set->state_dir,
+       instance_path = t_strconcat(master_service_get_service_settings(master_service)->state_dir,
                                    "/"MASTER_INSTANCE_FNAME, NULL);
        list = master_instance_list_init(instance_path);
        inst = master_instance_list_find_by_name(list, name);

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index 8a64abd7eb4205f0e46106613b3097d4c23716a0..c25bf62ba9f1c974b56667e7f1fea1d6bddf48cf 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -143,7 +143,6 @@ const struct setting_parser_info doveadm_setting_parser_info = {
 };
 
 struct doveadm_settings *doveadm_settings;
-const struct master_service_settings *service_set;
 
 static void
 fix_base_path(struct doveadm_settings *set, pool_t pool, const char **str)
@@ -267,9 +266,7 @@ void doveadm_read_settings(void)
        fd_close_on_exec(output.config_fd, TRUE);
 
        doveadm_settings_pool = pool_alloconly_create("doveadm settings", 1024);
-       service_set = master_service_settings_get_root_set_dup(master_service,
-               &master_service_setting_parser_info, doveadm_settings_pool);
-       doveadm_verbose_proctitle = service_set->verbose_proctitle;
+       doveadm_verbose_proctitle = master_service_get_service_settings(master_service)->verbose_proctitle;
 
        set = master_service_settings_get_root_set(
                master_service, &doveadm_setting_parser_info);

diff --git a/src/doveadm/doveadm-settings.h b/src/doveadm/doveadm-settings.h
index 86a7bfeffa1d52eca0cba0cf8694ab951bfa5ca1..707c7de061f9c7625218c436f95bc386085b6c17 100644 (file)
--- a/src/doveadm/doveadm-settings.h
+++ b/src/doveadm/doveadm-settings.h
@@ -46,7 +46,6 @@ ARRAY_DEFINE_TYPE(doveadm_setting_root, struct doveadm_setting_root);
 
 extern const struct setting_parser_info doveadm_setting_parser_info;
 extern struct doveadm_settings *doveadm_settings;
-extern const struct master_service_settings *service_set;
 extern const struct master_service_ssl_settings *doveadm_ssl_set;
 extern ARRAY_TYPE(doveadm_setting_root) doveadm_setting_roots;
 extern bool doveadm_verbose_proctitle;