From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 3 May 2023 20:06:06 +0000 (+0300)
Subject: doveconf: Strip named array filter prefix from keys
X-Git-Tag: 2.4.0~2070
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c69d8b3a4db13493184c9bfdfda9250fcbfc3e7d;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: Strip named array filter prefix from keys

This way the output will be namespace { prefix } rather than
namespace { namespace_prefix }
---

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index 3bc2e378a3..4946824bc3 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -318,7 +318,8 @@ config_dump_human_output(struct config_dump_human_context *ctx,
 			 struct ostream *output, unsigned int indent,
 			 const char *setting_name_filter,
 			 const char *alt_setting_name_filter,
-			 bool hide_key, bool default_hide_passwords)
+			 bool hide_key, bool default_hide_passwords,
+			 const char *strip_prefix)
 {
 	ARRAY_TYPE(const_string) prefixes_arr;
 	ARRAY_TYPE(prefix_stack) prefix_stack;
@@ -471,6 +472,9 @@ config_dump_human_output(struct config_dump_human_context *ctx,
 			o_stream_nsend(output, indent_str, indent*2);
 		key = strings[i] + skip_len;
 		if (unique_key) key++;
+		const char *full_key = key;
+		if (strip_prefix != NULL && str_begins(key, strip_prefix, &key))
+			key++;
 		value = strchr(key, '=');
 		i_assert(value != NULL);
 		if (!hide_key) {
@@ -481,7 +485,7 @@ config_dump_human_output(struct config_dump_human_context *ctx,
 				i_fatal("Multiple settings matched with -h parameter");
 		}
 		if (hide_passwords &&
-		    hide_secrets_from_value(output, key, value+1))
+		    hide_secrets_from_value(output, full_key, value+1))
 			/* sent */
 			;
 		else if (!value_need_quote(value+1))
@@ -679,7 +683,7 @@ config_dump_human_filter_path(enum config_dump_scope scope,
 		config_dump_human_output(ctx, output, sub_indent,
 					 set_name_filter,
 					 alt_set_name_filter, hide_key,
-					 sub_hide_passwords);
+					 sub_hide_passwords, filter_key);
 
 		bool sub_list_prefix_sent = ctx->list_prefix_sent;
 		if (sub_list_prefix_sent) {
@@ -723,7 +727,7 @@ config_dump_human(enum config_dump_scope scope,
 	config_export_set_module_parsers(ctx->export_ctx,
 					 filter_parser->module_parsers);
 	config_dump_human_output(ctx, output, 0, setting_name_filter, NULL,
-				 hide_key, hide_passwords);
+				 hide_key, hide_passwords, NULL);
 	config_dump_human_deinit(ctx);
 
 	string_t *list_prefix = t_str_new(128);