config: Support automatic filter name setting prefixing for named non-list filters...

They were working only for named list filters. This also changes
filter_name { filter_name_key } settings (when "filter_name" string is the
same in both) to apply to the global filter_name_key setting instead of
adding it inside the named filter.

diff --git a/src/config/config-filter.c b/src/config/config-filter.c
index 64f89c45653e24fab96cbaf83218cd78eae9807c..eb1102ff539ac239b31c9483d3143d97e92558eb 100644 (file)
--- a/src/config/config-filter.c
+++ b/src/config/config-filter.c
@@ -124,3 +124,8 @@ bool config_filters_equal(const struct config_filter *f1,
        }
        return TRUE;
 }
+
+bool config_filter_is_empty(const struct config_filter *filter)
+{
+       return config_filters_equal(filter, &empty_filter);
+}

diff --git a/src/config/config-filter.h b/src/config/config-filter.h
index f74a403baead51c91403fa28de35d586b73b73c4..28f2259eda783ee98d108dbdfa2a328a5881f50f 100644 (file)
--- a/src/config/config-filter.h
+++ b/src/config/config-filter.h
@@ -33,6 +33,7 @@ struct config_filter {
 struct config_filter_parser {
        /* Filter parser tree. These are used only for doveconf's human output
           to write the filters in nice nested hierarchies. */
+       struct config_filter_parser *parent;
        struct config_filter_parser *children_head, *children_tail, *prev, *next;
 
        /* Filter for this parser. Its parent filters must also match. */
@@ -53,5 +54,7 @@ bool config_filter_match(const struct config_filter *mask,
 /* Returns TRUE if two filters are fully equal. */
 bool config_filters_equal(const struct config_filter *f1,
                          const struct config_filter *f2);
+/* Returns TRUE if filter is empty, and it has no parent filters. */
+bool config_filter_is_empty(const struct config_filter *filter);
 
 #endif

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index 211f54f866f1d5e4f176f4438bae0af6b838d99f..3c9d7b69f287c15d8685344c94256776d3875abb 100644 (file)
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -607,7 +607,8 @@ static int
 config_apply_line_full(struct config_parser_context *ctx,
                       const struct config_line *line,
                       const char *key_with_path,
-                      const char *value, const char **full_key_r)
+                      const char *value, const char **full_key_r,
+                      bool *root_setting_r)
 {
        struct config_filter_parser *filter_parser, *orig_filter_parser;
        const char *p, *key;
@@ -670,21 +671,49 @@ config_apply_line_full(struct config_parser_context *ctx,
        /* the only '/' left should be if key is under list/ */
        key = key_with_path;
 
-       if (ctx->cur_section->filter_parser->filter.filter_name_array) {
+       if (ctx->cur_section->filter_parser->filter.filter_name != NULL) {
                /* first try the filter name-specific prefix, so e.g.
                   inet_listener { ssl=yes } won't try to change the global
                   ssl setting. */
                const char *filter_key =
                        t_strcut(ctx->cur_section->filter_parser->filter.filter_name, '/');
                const char *key2 = t_strdup_printf("%s_%s", filter_key, key);
+               struct config_filter_parser *last_filter_parser =
+                       ctx->cur_section->filter_parser;
+               if (!ctx->cur_section->filter_parser->filter.filter_name_array) {
+                       /* For named non-list filters, if the setting name
+                          prefix equals the filter name, change the setting
+                          outside the filter. Otherwise it's rather confusing
+                          if foo_key=value is different from foo { key=value }.
+                          Also the latter would require settings_get() call to
+                          have "foo" filter named enabled in the event to be
+                          able to get foo_key's value, which isn't always done
+                          (or useful, or easy). */
+                       ctx->cur_section->filter_parser =
+                               ctx->cur_section->filter_parser->parent;
+                       const char *suffix;
+                       if (str_begins(key, filter_key, &suffix) &&
+                           suffix[0] == '_') {
+                               /* don't try filter_filter_key, but do apply
+                                  filter_key to the parent filter_parser */
+                               key2 = key;
+                       }
+               }
                ret = config_apply_exact_line(ctx, line, key2, value);
-               if (ret > 0 && full_key_r != NULL)
+               if (ret > 0 && full_key_r != NULL) {
                        *full_key_r = key2;
+                       *root_setting_r = config_filter_is_empty(
+                               &ctx->cur_section->filter_parser->filter);
+               }
+               ctx->cur_section->filter_parser = last_filter_parser;
        }
        if (ret == 0) {
                ret = config_apply_exact_line(ctx, line, key, value);
-               if (full_key_r != NULL)
+               if (full_key_r != NULL) {
+                       *root_setting_r = config_filter_is_empty(
+                               &ctx->cur_section->filter_parser->filter);
                        *full_key_r = key;
+               }
        }
        ctx->cur_section->filter_parser = orig_filter_parser;
        if (ret == 0) {
@@ -699,8 +728,9 @@ int config_apply_line(struct config_parser_context *ctx,
                      const char *key_with_path,
                      const char *value, const char **full_key_r)
 {
+       bool root_setting;
        return config_apply_line_full(ctx, NULL, key_with_path,
-                                     value, full_key_r);
+                                     value, full_key_r, &root_setting);
 }
 
 static int
@@ -771,6 +801,7 @@ config_add_new_parser(struct config_parser_context *ctx,
        array_push_back(&ctx->all_filter_parsers, &filter_parser);
 
        if (parent_filter_parser != NULL) {
+               filter_parser->parent = parent_filter_parser;
                DLLIST2_APPEND(&parent_filter_parser->children_head,
                               &parent_filter_parser->children_tail,
                               filter_parser);
@@ -1708,7 +1739,8 @@ config_section_has_non_named_filters(struct config_section_stack *section)
 }
 
 static void
-config_parser_check_warnings(struct config_parser_context *ctx, const char *key)
+config_parser_check_warnings(struct config_parser_context *ctx, const char *key,
+                            bool root_setting)
 {
        const char *path, *first_pos;
 
@@ -1719,7 +1751,7 @@ config_parser_check_warnings(struct config_parser_context *ctx, const char *key)
        }
 
        first_pos = hash_table_lookup(ctx->seen_settings, key);
-       if (ctx->cur_section->prev == NULL) {
+       if (root_setting) {
                /* changing a root setting. if we've already seen it inside
                   filters, log a warning. */
                if (first_pos == NULL)
@@ -1809,6 +1841,7 @@ void config_parser_apply_line(struct config_parser_context *ctx,
                              const struct config_line *line)
 {
        const char *full_key;
+       bool root_setting;
 
        switch (line->type) {
        case CONFIG_LINE_TYPE_SKIP:
@@ -1834,9 +1867,11 @@ void config_parser_apply_line(struct config_parser_context *ctx,
                                                line->key) :
                                line->key;
                        if (config_apply_line_full(ctx, line, key_with_path,
-                                                  str_c(ctx->value),
-                                                  &full_key) == 0)
-                               config_parser_check_warnings(ctx, full_key);
+                                                  str_c(ctx->value), &full_key,
+                                                  &root_setting) == 0) {
+                               config_parser_check_warnings(ctx, full_key,
+                                                            root_setting);
+                       }
                }
                break;
        case CONFIG_LINE_TYPE_SECTION_BEGIN: