lib-storage: Rename unexpanded_set_parsers to set_parsers

The settings are no longer expanded inside set_parsers, so they're always
unexpanded.

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index 728ba8ed7ca8dee9d0599139b728f798ef9ac85b..f7ad949a2479cf8649cc1ed348e1d76577c46838 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -17,7 +17,7 @@ extern struct mailbox raw_mailbox;
 
 struct mail_user *
 raw_storage_create_from_set(struct mail_storage_service_ctx *ctx,
-                           struct setting_parser_context *unexpanded_set_parser)
+                           struct setting_parser_context *set_parser)
 {
        struct mail_user *user;
        struct mail_namespace *ns;
@@ -45,7 +45,7 @@ raw_storage_create_from_set(struct mail_storage_service_ctx *ctx,
        struct mail_storage_service_input input = {
                .event_parent = event,
                .username = "raw-mail-user",
-               .unexpanded_set_parser = unexpanded_set_parser,
+               .set_parser = set_parser,
                .autocreated = TRUE,
                .no_userdb_lookup = TRUE,
                .userdb_fields = userdb_fields,

diff --git a/src/lib-storage/index/raw/raw-storage.h b/src/lib-storage/index/raw/raw-storage.h
index ecd4255626625b9203a388a57eed62900e0356db..f366cae60fefd77410ea394656c056e9e432a726 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.h
+++ b/src/lib-storage/index/raw/raw-storage.h
@@ -32,7 +32,7 @@ extern struct mail_vfuncs raw_mail_vfuncs;
 
 struct mail_user *
 raw_storage_create_from_set(struct mail_storage_service_ctx *ctx,
-                           struct setting_parser_context *unexpanded_set_parser);
+                           struct setting_parser_context *set_parser);
 
 int raw_mailbox_alloc_stream(struct mail_user *user, struct istream *input,
                             time_t received_time, const char *envelope_sender,

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 7a3f9dc9ccce15041bc34ec608a12b3cf294fea0..3445758df81d4abce3c499846c86e3c398de38d1 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -263,7 +263,7 @@ int shared_storage_get_namespace(struct mail_namespace **_ns,
        const struct mail_storage_service_input input = {
                .event_parent = event_get_parent(service_user_event),
                .username = userdomain,
-               .unexpanded_set_parser = service_user_set_parser,
+               .set_parser = service_user_set_parser,
                .session_id = user->session_id,
                .autocreated = TRUE,
                .no_userdb_lookup = TRUE,

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index d42bc09f3e1fb9b7bccce5866910235b1eaa7790..6b16e36bec6ceb1ab6da621895c94631f319af0a 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1201,8 +1201,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
                mail_storage_service_seteuid_root();
        }
 
-       if (input->unexpanded_set_parser != NULL)
-               set_parser = input->unexpanded_set_parser;
+       if (input->set_parser != NULL)
+               set_parser = input->set_parser;
        else if (mail_storage_service_read_settings(ctx, input,
                                                    &set_parser, error_r) < 0) {
                if (ctx->config_permission_denied) {

diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index 86f84258b82d95abb94c736c88ba74b222847add..749de4c62dbd44b54ee729650312d3c394585229 100644 (file)
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -59,7 +59,7 @@ struct mail_storage_service_input {
        const char *const *forward_fields;
 
        /* Use this settings parser instead of looking it up. */
-       struct setting_parser_context *unexpanded_set_parser;
+       struct setting_parser_context *set_parser;
 
        /* Override specified global flags */
        enum mail_storage_service_flags flags_override_add;