global: Rename setting_parser_info.default_filter_settings to default_settings

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 2c59b7c7c4491d1d7fe6d67241dc01325bf0c704..5eaa1c5e87b9c4805618b8ab4407a46afef5d7e4 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -335,7 +335,7 @@ static const struct auth_settings auth_default_settings = {
        .first_valid_gid = 1,
        .last_valid_gid = 0,
 };
-static const struct setting_keyvalue auth_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue auth_default_settings_keyvalue[] = {
        { "auth_mechanisms", "plain" },
        { "auth_policy/http_client_request_absolute_timeout", "2s" },
        { "auth_policy/http_client_max_idle_time", "10s" },
@@ -355,7 +355,7 @@ const struct setting_parser_info auth_setting_parser_info = {
 
        .defines = auth_setting_defines,
        .defaults = &auth_default_settings,
-       .default_filter_settings = auth_default_filter_settings_keyvalue,
+       .default_settings = auth_default_settings_keyvalue,
 
        .struct_size = sizeof(struct auth_settings),
        .pool_offset1 = 1 + offsetof(struct auth_settings, pool),

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index d116e0b3b254a76c700ee28ea13143ddc343dcf2..dac053ac7300677e86ae98196742b9b331b1d8de 100644 (file)
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -250,7 +250,7 @@ static void config_parser_add_info_defaults(struct config_parser_context *ctx,
                                            const struct setting_parser_info *info)
 {
        config_parser_set_change_counter(ctx, CONFIG_PARSER_CHANGE_INTERNAL);
-       config_parser_add_info_defaults_arr(ctx, info, info->default_filter_settings);
+       config_parser_add_info_defaults_arr(ctx, info, info->default_settings);
        config_parser_set_change_counter(ctx, CONFIG_PARSER_CHANGE_EXPLICIT);
 }
 
@@ -1642,7 +1642,7 @@ config_filter_parser_drop_overridden_default_settings(
 }
 
 static void
-config_drop_overridden_default_filter_settings(struct config_parser_context *ctx)
+config_drop_overridden_default_settings(struct config_parser_context *ctx)
 {
        struct config_filter_parser *filter_parser;
 
@@ -1669,7 +1669,7 @@ config_parse_finish(struct config_parser_context *ctx,
        new_config->dovecot_config_version = ctx->dovecot_config_version;
        p_array_init(&new_config->errors, ctx->pool, 1);
 
-       config_drop_overridden_default_filter_settings(ctx);
+       config_drop_overridden_default_settings(ctx);
 
        array_append_zero(&ctx->all_filter_parsers);
        new_config->filter_parsers = array_front(&ctx->all_filter_parsers);

diff --git a/src/config/settings-get.pl b/src/config/settings-get.pl
index 713ee3921e0c5f60cd53c9c3d53c76c86ddfb909..2b73ba7ab301e0bac9cb3711cdfb5bfa16c35381 100755 (executable)
--- a/src/config/settings-get.pl
+++ b/src/config/settings-get.pl
@@ -53,7 +53,7 @@ foreach my $file (@ARGV) {
       if (/struct .*_settings \{/ ||
           /struct setting_define.*\{/ ||
           /struct .*_default_settings = \{/ ||
-          /struct setting_keyvalue.*_default_filter_settings_keyvalue\[\] = \{/) {
+          /struct setting_keyvalue.*_default_settings_keyvalue\[\] = \{/) {
         # settings-related structure - copy.
         $state = "copy-to-end-of-block";
       } elsif (/^struct service_settings (.*) = \{/) {

diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h
index 7e4d8dad13463e9c4c1c1cd1d6edd7bffc453994..c12761b24eef061f8160836f09b2f7bfc1116656 100644 (file)
--- a/src/lib-settings/settings-parser.h
+++ b/src/lib-settings/settings-parser.h
@@ -123,9 +123,8 @@ struct setting_parser_info {
 
        const struct setting_define *defines;
        const void *defaults;
-       /* Add defaults to named filters. These are applied while parsing
-          the configuration. */
-       const struct setting_keyvalue *default_filter_settings;
+       /* Add defaults via strings on top of the of defaults struct. */
+       const struct setting_keyvalue *default_settings;
 
        size_t struct_size;
        size_t pool_offset1; /* 1 + offset to pool_t field */

diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index e61c921ba994fb3b0b11d1c70acaffe996c1aa87..849d5a0609e0236bb1518a12541918f3e57216d2 100644 (file)
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -1352,8 +1352,7 @@ static void
 settings_instance_overrides_add_filters(struct settings_apply_ctx *ctx,
                                        const struct setting_parser_info *info)
 {
-       const struct setting_keyvalue *defaults =
-               info->default_filter_settings;
+       const struct setting_keyvalue *defaults = info->default_settings;
        struct settings_override *set;
 
        if (defaults == NULL)
@@ -1392,7 +1391,7 @@ settings_instance_override_init(struct settings_apply_ctx *ctx)
        }
        if ((ctx->instance->mmap == NULL || have_2nd_defaults) &&
            array_is_created(&set_registered_infos)) {
-               /* a) No configuration - default_filter_settings won't be
+               /* a) No configuration - default_settings won't be
                   applied unless we add them here also. This isn't for any
                   production use, so performance doesn't matter.
                   b) SETTINGS_OVERRIDE_TYPE_2ND_DEFAULT has been used -

diff --git a/src/lib-settings/settings.h b/src/lib-settings/settings.h
index 5719b97cf93b67cb968a2a28999967482a1e509c..87394bd24f0307ad676de8d34d5d28c6d4082632 100644 (file)
--- a/src/lib-settings/settings.h
+++ b/src/lib-settings/settings.h
@@ -289,7 +289,7 @@ bool settings_has_mmap(struct settings_root *root);
 struct settings_root *settings_root_init(void);
 void settings_root_deinit(struct settings_root **root);
 
-/* Explicitly register settings info. This is needed if default_filter_settings
+/* Explicitly register settings info. This is needed if default_settings
    are specified to get the defaults to work when configuration isn't read
    (-O parameter or unit tests). */
 void settings_info_register(const struct setting_parser_info *info);

diff --git a/src/lib-storage/index/dbox-multi/mdbox-settings.c b/src/lib-storage/index/dbox-multi/mdbox-settings.c
index f80b8174cde0865f37e2ae29e9735ab1e10af80a..4b388d35a418a81463672f629cf762bccd1d0066 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-settings.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-settings.c
@@ -25,7 +25,7 @@ static const struct mdbox_settings mdbox_default_settings = {
        .mdbox_rotate_interval = 0
 };
 
-static const struct setting_keyvalue mdbox_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue mdbox_default_settings_keyvalue[] = {
        { "mdbox/mailbox_root_directory_name", DBOX_MAILBOX_DIR_NAME },
        { "mdbox/mailbox_directory_name", DBOX_MAILDIR_NAME },
        { "mdbox/mail_path", "%{home}/mdbox" },
@@ -37,7 +37,7 @@ const struct setting_parser_info mdbox_setting_parser_info = {
 
        .defines = mdbox_setting_defines,
        .defaults = &mdbox_default_settings,
-       .default_filter_settings = mdbox_default_filter_settings_keyvalue,
+       .default_settings = mdbox_default_settings_keyvalue,
 
        .struct_size = sizeof(struct mdbox_settings),
        .pool_offset1 = 1 + offsetof(struct mdbox_settings, pool),

diff --git a/src/lib-storage/index/dbox-single/sdbox-settings.c b/src/lib-storage/index/dbox-single/sdbox-settings.c
index 18594aaf5afd0311d1c9b2e2b770b1409fea23c0..7dc29f75d66316535f70853cda392cfc4aa0d371 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-settings.c
+++ b/src/lib-storage/index/dbox-single/sdbox-settings.c
@@ -14,7 +14,7 @@ static const struct setting_define sdbox_setting_defines[] = {
 static const struct sdbox_settings sdbox_default_settings = {
 };
 
-static const struct setting_keyvalue sdbox_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue sdbox_default_settings_keyvalue[] = {
        { "sdbox/mailbox_root_directory_name", DBOX_MAILBOX_DIR_NAME },
        { "sdbox/mailbox_directory_name", DBOX_MAILDIR_NAME },
        { "sdbox/mail_path", "%{home}/sdbox" },
@@ -26,7 +26,7 @@ const struct setting_parser_info sdbox_setting_parser_info = {
 
        .defines = sdbox_setting_defines,
        .defaults = &sdbox_default_settings,
-       .default_filter_settings = sdbox_default_filter_settings_keyvalue,
+       .default_settings = sdbox_default_settings_keyvalue,
 
        .struct_size = sizeof(struct sdbox_settings),
        .pool_offset1 = 1 + offsetof(struct sdbox_settings, pool),

diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c
index 3667642d24ed5038dd8646aafc0dac58c929557e..c2633991236cc6f2a09a466ebb0172b8f0314c2a 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-storage/index/imapc/imapc-settings.c
@@ -63,7 +63,7 @@ static const struct imapc_settings imapc_default_settings = {
        .pop3_deleted_flag = ""
 };
 
-static const struct setting_keyvalue imapc_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue imapc_default_settings_keyvalue[] = {
        { "imapc/mailbox_list_layout", "imapc" },
        /* We want to have all imapc mailboxes accessible, so escape them if
           necessary. */
@@ -77,7 +77,7 @@ const struct setting_parser_info imapc_setting_parser_info = {
 
        .defines = imapc_setting_defines,
        .defaults = &imapc_default_settings,
-       .default_filter_settings = imapc_default_filter_settings_keyvalue,
+       .default_settings = imapc_default_settings_keyvalue,
 
        .struct_size = sizeof(struct imapc_settings),
        .pool_offset1 = 1 + offsetof(struct imapc_settings, pool),

diff --git a/src/lib-storage/index/maildir/maildir-settings.c b/src/lib-storage/index/maildir/maildir-settings.c
index ac00efd0273aac1e401c3c46edbc26cab1017c92..77fc09c74bc03c6d04aeec49e832a398e1e1352c 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-settings.c
+++ b/src/lib-storage/index/maildir/maildir-settings.c
@@ -26,7 +26,7 @@ static const struct maildir_settings maildir_default_settings = {
        .maildir_empty_new = FALSE
 };
 
-static const struct setting_keyvalue maildir_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue maildir_default_settings_keyvalue[] = {
        { "maildir/mailbox_list_layout", "maildir++" },
        { "maildir/mail_path", "%{home}/Maildir" },
        /* Use Maildir/ root as the INBOX, not Maildir/.INBOX/ */
@@ -40,7 +40,7 @@ const struct setting_parser_info maildir_setting_parser_info = {
 
        .defines = maildir_setting_defines,
        .defaults = &maildir_default_settings,
-       .default_filter_settings = maildir_default_filter_settings_keyvalue,
+       .default_settings = maildir_default_settings_keyvalue,
 
        .struct_size = sizeof(struct maildir_settings),
        .pool_offset1 = 1 + offsetof(struct maildir_settings, pool),

diff --git a/src/lib-storage/index/mbox/mbox-settings.c b/src/lib-storage/index/mbox/mbox-settings.c
index 6f24b8da20c403c703c6f92ec63962a4a0444729..233703425c8c9414e828497e810512f10c5e86db 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-settings.c
+++ b/src/lib-storage/index/mbox/mbox-settings.c
@@ -36,7 +36,7 @@ static const struct mbox_settings mbox_default_settings = {
        .mbox_md5 = "apop3d:all"
 };
 
-static const struct setting_keyvalue mbox_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue mbox_default_settings_keyvalue[] = {
        { "mbox/mailbox_subscriptions_filename", ".subscriptions" },
        { "mbox/mail_path", "%{home}/mail" },
        /* Use $mail_path/inbox as the INBOX, not $mail_path/INBOX */
@@ -49,7 +49,7 @@ const struct setting_parser_info mbox_setting_parser_info = {
 
        .defines = mbox_setting_defines,
        .defaults = &mbox_default_settings,
-       .default_filter_settings = mbox_default_filter_settings_keyvalue,
+       .default_settings = mbox_default_settings_keyvalue,
 
        .struct_size = sizeof(struct mbox_settings),
        .pool_offset1 = 1 + offsetof(struct mbox_settings, pool),

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index d2c493a7c608af79c4979bfee90d2e45dd8c5a08..b2347ad7e5fe6aa8fefd1b3231b424e6fc97abc5 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -193,7 +193,7 @@ const struct mail_storage_settings mail_storage_default_settings = {
        .plugin_envs = ARRAY_INIT,
 };
 
-static const struct setting_keyvalue mail_storage_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue mail_storage_default_settings_keyvalue[] = {
        { "layout_index/mailbox_list_storage_escape_char", "^" },
        { NULL, NULL }
 };
@@ -203,7 +203,7 @@ const struct setting_parser_info mail_storage_setting_parser_info = {
 
        .defines = mail_storage_setting_defines,
        .defaults = &mail_storage_default_settings,
-       .default_filter_settings = mail_storage_default_filter_settings_keyvalue,
+       .default_settings = mail_storage_default_settings_keyvalue,
 
        .struct_size = sizeof(struct mail_storage_settings),
        .pool_offset1 = 1 + offsetof(struct mail_storage_settings, pool),

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 00490393beb8bbd4a402c1b119bfcdfcae96497a..817de24bfbf14177742a6dd2b075c983f8ae568e 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -243,7 +243,7 @@ const struct setting_parser_info master_setting_parser_info = {
 
        .defines = master_setting_defines,
        .defaults = &master_default_settings,
-       .default_filter_settings = master_default_settings_keyvalue,
+       .default_settings = master_default_settings_keyvalue,
 
        .struct_size = sizeof(struct master_settings),
        .pool_offset1 = 1 + offsetof(struct master_settings, pool),

diff --git a/src/plugins/virtual/virtual-settings.c b/src/plugins/virtual/virtual-settings.c
index 3ec21451f0eeb81a86f6fd5f756843572dd50125..7ce774b548e77b411eaf43c5dd1f63b962d2f894 100644 (file)
--- a/src/plugins/virtual/virtual-settings.c
+++ b/src/plugins/virtual/virtual-settings.c
@@ -13,7 +13,7 @@ static const struct setting_define virtual_setting_defines[] = {
 static const struct virtual_settings virtual_default_settings = {
 };
 
-static const struct setting_keyvalue virtual_default_filter_settings_keyvalue[] = {
+static const struct setting_keyvalue virtual_default_settings_keyvalue[] = {
        { "virtual/mailbox_subscriptions_filename", ".virtual-subscriptions" },
        { NULL, NULL }
 };
@@ -23,7 +23,7 @@ const struct setting_parser_info virtual_setting_parser_info = {
 
        .defines = virtual_setting_defines,
        .defaults = &virtual_default_settings,
-       .default_filter_settings = virtual_default_filter_settings_keyvalue,
+       .default_settings = virtual_default_settings_keyvalue,
 
        .struct_size = sizeof(struct virtual_settings),
        .pool_offset1 = 1 + offsetof(struct virtual_settings, pool),