global: Use master_service_settings_get_root_set_dup()

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index 37dbb067444344c1211422af2cd350a462db0b13..aca3ffe6392af496f77aa46ec843b5acc6db8f45 100644 (file)
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -39,7 +39,6 @@ static int client_connection_read_settings(struct client_connection *conn)
        struct master_service_settings_input input;
        struct master_service_settings_output output;
        const char *error;
-       void *set;
 
        i_zero(&input);
        input.roots = set_roots;
@@ -52,9 +51,8 @@ static int client_connection_read_settings(struct client_connection *conn)
                e_error(conn->event, "Error reading configuration: %s", error);
                return -1;
        }
-       set = master_service_settings_get_root_set(master_service,
-                               &doveadm_setting_parser_info);
-       conn->set = settings_dup(&doveadm_setting_parser_info, set, conn->pool);
+       conn->set = master_service_settings_get_root_set_dup(master_service,
+                               &doveadm_setting_parser_info, conn->pool);
        return 0;
 }
 

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index 4069b3e952157c02a363e6ccb983bf1e4b51a9a7..d75c6218d4b742de2cc944fd2f9d67d3caa728e2 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -283,7 +283,6 @@ static void main_init(void)
        const struct setting_parser_info *user_info;
        const struct setting_parser_context *set_parser;
        const struct mail_user_settings *user_set;
-       const struct quota_status_settings *set;
        const char *value, *error;
        pool_t pool;
 
@@ -308,11 +307,10 @@ static void main_init(void)
                i_fatal("%s", error);
        user_set = settings_parser_get_root_set(set_parser,
                        &mail_user_setting_parser_info);
-       set = master_service_settings_get_root_set(master_service,
-                               &quota_status_setting_parser_info);
+       quota_status_settings = master_service_settings_get_root_set_dup(
+               master_service, &quota_status_setting_parser_info,
+               quota_status_pool);
 
-       quota_status_settings = settings_dup(&quota_status_setting_parser_info, set,
-                                            quota_status_pool);
        value = mail_user_set_plugin_getenv(user_set, "quota_status_nouser");
        nouser_reply = p_strdup(quota_status_pool,
                                value != NULL ? value : "REJECT Unknown user");