lib-storage, global: mail_storage_service_read_settings() - Remove unused pool parameter

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 2d08387a080fb5e8b2b66345ff67f93e7006ad41..01800477f8582e083ffddc6f06b9de5e23ac9d56 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1058,7 +1058,6 @@ mail_storage_service_add_storage_set_roots(struct mail_storage_service_ctx *ctx)
 
 int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
                                       const struct mail_storage_service_input *input,
-                                      pool_t pool ATTR_UNUSED,
                                       const struct setting_parser_info **user_info_r,
                                       const struct setting_parser_context **parser_r,
                                       const char **error_r)
@@ -1273,9 +1272,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
                mail_storage_service_seteuid_root();
        }
 
-       if (mail_storage_service_read_settings(ctx, input, user_pool,
-                                              &user_info, &set_parser,
-                                              error_r) < 0) {
+       if (mail_storage_service_read_settings(ctx, input, &user_info,
+                                              &set_parser, error_r) < 0) {
                if (ctx->config_permission_denied) {
                        /* just restart and maybe next time we will open the
                           config socket before dropping privileges */
@@ -1701,21 +1699,17 @@ void mail_storage_service_init_settings(struct mail_storage_service_ctx *ctx,
        const struct mail_user_settings *user_set;
        const struct setting_parser_context *set_parser;
        const char *error;
-       pool_t temp_pool;
 
        if (ctx->conn != NULL)
                return;
 
-       temp_pool = pool_alloconly_create("service all settings", 4096);
-       if (mail_storage_service_read_settings(ctx, input, temp_pool,
-                                              &user_info, &set_parser,
-                                              &error) < 0)
+       if (mail_storage_service_read_settings(ctx, input, &user_info,
+                                              &set_parser, &error) < 0)
                i_fatal("%s", error);
        user_set = settings_parser_get_root_set(set_parser,
                                                &mail_user_setting_parser_info);
 
        mail_storage_service_first_init(ctx, set_parser, user_set, ctx->flags);
-       pool_unref(&temp_pool);
 }
 
 static int

diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index 61c995f6ef183794a3ca736c052e4d9b93bf2a83..18aa238c7b8cdf72406ec3c9da9d7dfe3a1c9f78 100644 (file)
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -86,7 +86,6 @@ void mail_storage_service_set_auth_conn(struct mail_storage_service_ctx *ctx,
                                        struct auth_master_connection *conn);
 int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
                                       const struct mail_storage_service_input *input,
-                                      pool_t pool,
                                       const struct setting_parser_info **user_info_r,
                                       const struct setting_parser_context **parser_r,
                                       const char **error_r) ATTR_NULL(2);

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index de982af885c8cf8b662da8eb6f86834a95fc615b..3255b8d553b2f963387d200ffb42fc5557321ac9 100644 (file)
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -124,7 +124,6 @@ static void client_read_settings(struct client *client, bool ssl)
        input.username = "";
 
        if (mail_storage_service_read_settings(storage_service, &input,
-                                              client->pool,
                                               &client->user_set_info,
                                               &set_parser, &error) < 0)
                i_fatal("%s", error);

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index d75c6218d4b742de2cc944fd2f9d67d3caa728e2..331a5efd806210622a4502e8a54410d66fb344eb 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -284,7 +284,6 @@ static void main_init(void)
        const struct setting_parser_context *set_parser;
        const struct mail_user_settings *user_set;
        const char *value, *error;
-       pool_t pool;
 
        clients = connection_list_init(&client_set, &client_vfuncs);
        storage_service = mail_storage_service_init(master_service, set_roots,
@@ -300,8 +299,7 @@ static void main_init(void)
        input.username = "";
 
        quota_status_pool = pool_alloconly_create("quota status settings", 512);
-       pool = pool_alloconly_create("service all settings", 4096);
-       if (mail_storage_service_read_settings(storage_service, &input, pool,
+       if (mail_storage_service_read_settings(storage_service, &input,
                                               &user_info, &set_parser,
                                               &error) < 0)
                i_fatal("%s", error);
@@ -314,7 +312,6 @@ static void main_init(void)
        value = mail_user_set_plugin_getenv(user_set, "quota_status_nouser");
        nouser_reply = p_strdup(quota_status_pool,
                                value != NULL ? value : "REJECT Unknown user");
-       pool_unref(&pool);
 }
 
 static void main_deinit(void)