From: sergey.kitov <sergey.kitov@open-xchange.com>
Date: Thu, 29 Aug 2024 08:43:54 +0000 (+0300)
Subject: lib-settings: Allow override setting keys ending with '+' for non SET_STR and SET_FIL... 
X-Git-Tag: 2.4.0~350
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90ce4956de6fc6da5fc5d3a4382555a8fa35a0f2;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: Allow override setting keys ending with '+' for non SET_STR and SET_FILTER_ARRAY types.

For SET_STR and SET_FILTER_ARRAY types + at the end of the key is
treated as appending to the value.
Particularly, this change allows boollist entries to end with '+'.
---

diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index 7dbccc358d..83d8755a41 100644
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -1491,7 +1491,7 @@ static int
 settings_override_get_value(struct settings_apply_ctx *ctx,
 			    const struct settings_override *set,
 			    const char **_key, unsigned int *key_idx_r,
-			    const char **value_r, const char **error_r)
+			    const char **value_r)
 {
 	const char *key = *_key;
 	unsigned int key_idx = UINT_MAX;
@@ -1522,8 +1522,11 @@ settings_override_get_value(struct settings_apply_ctx *ctx,
 		key = t_strconcat(ctx->info->defines[key_idx].key, list, NULL);
 
 	if (!set->append ||
-	    ctx->info->defines[key_idx].type == SET_FILTER_ARRAY) {
-		*_key = key;
+	    ctx->info->defines[key_idx].type != SET_STR) {
+		if (set->append && ctx->info->defines[key_idx].type != SET_FILTER_ARRAY)
+			*_key = t_strconcat(key, "+", NULL);
+		else
+			*_key = key;
 		*key_idx_r = key_idx;
 
 		const char *inline_value;
@@ -1535,11 +1538,6 @@ settings_override_get_value(struct settings_apply_ctx *ctx,
 		return 1;
 	}
 
-	if (ctx->info->defines[key_idx].type != SET_STR) {
-		*error_r = t_strdup_printf(
-			"%s setting is not a string or named list filter - can't use '+'", key);
-		return -1;
-	}
 	const char *const *strp =
 		PTR_OFFSET(ctx->set_struct, ctx->info->defines[key_idx].offset);
 	*_key = key;
@@ -1783,7 +1781,7 @@ settings_instance_override(struct settings_apply_ctx *ctx,
 			continue;
 		}
 		ret = settings_override_get_value(ctx, set, &key,
-						  &key_idx, &value, error_r);
+						  &key_idx, &value);
 		if (ret < 0)
 			return -1;
 		if (ret == 0) {