From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Mon, 3 Feb 2025 09:28:44 +0000 (+0200)
Subject: lib-var-expand: Remove duplicate prefix from providers
X-Git-Tag: 2.4.1~237
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc1c1c09d77cc8d6a0549d6457dcc9ef7191b853;p=thirdparty%2Fdovecot%2Fcore.git

lib-var-expand: Remove duplicate prefix from providers
---

diff --git a/src/lib-var-expand/test-var-expand.c b/src/lib-var-expand/test-var-expand.c
index a87815678f..6d6a666826 100644
--- a/src/lib-var-expand/test-var-expand.c
+++ b/src/lib-var-expand/test-var-expand.c
@@ -419,12 +419,12 @@ static void test_var_expand_providers(void) {
 		{ .in = "%{dovecot:revision}", .out = DOVECOT_REVISION, .ret = 0 },
 		{ .in = "%{env:USER}", .out = user, .ret = 0 },
 		{ .in = "%{env:missing}", .out = "", .ret = 0 },
-		{ .in = "%{dovecot:invalid}", .out = "Unsupported dovecot key 'invalid'", .ret = -1 },
+		{ .in = "%{dovecot:invalid}", .out = "dovecot: Unsupported field 'invalid'", .ret = -1 },
 		{ .in = "%{invalid:whatever}", .out = "Unsupported prefix 'invalid'", .ret = -1 },
 		{ .in = "%{custom:value}", .out = "test", .ret = 0 },
-		{ .in = "%{custom:null}", .out = "Unsupported key 'null'", .ret = -1 },
+		{ .in = "%{custom:null}", .out = "custom: Unsupported key 'null'", .ret = -1 },
 		{ .in = "%{event:string}", .out = "event", .ret = 0 },
-		{ .in = "%{event:missing}", .out = "No such field 'missing' in event", .ret = -1 },
+		{ .in = "%{event:missing}", .out = "event: No such field 'missing' in event", .ret = -1 },
 		{ .in = "%{event:missing|default}", .out = "", .ret = 0 },
 		{ .in = "%{event:magic}", .out = "42", .ret = 0 },
 	};
diff --git a/src/lib-var-expand/var-expand.c b/src/lib-var-expand/var-expand.c
index 35955b2647..2248e69c90 100644
--- a/src/lib-var-expand/var-expand.c
+++ b/src/lib-var-expand/var-expand.c
@@ -39,7 +39,7 @@ var_expand_process(const char *field, const char **result_r,
 	else if (strcmp(field, "gid") == 0)
 		*result_r = dec2str(getegid());
 	else {
-		*error_r = t_strdup_printf("Unsupported process field '%s'",
+		*error_r = t_strdup_printf("Unsupported field '%s'",
 					   field);
 		return -1;
 	}
@@ -101,7 +101,7 @@ var_expand_system(const char *field, const char **result_r,
 	else if (strcmp(field, "os-version") == 0)
 		return var_expand_system_os(OS_DEFAULT_TYPE_RELEASE, result_r,
 					    error_r);
-	*error_r = t_strdup_printf("Unsupported system key '%s'", field);
+	*error_r = t_strdup_printf("Unsupported field '%s'", field);
 	return -1;
 }
 
@@ -126,7 +126,7 @@ var_expand_dovecot(const char *field, const char **result_r,
 		return 0;
 	}
 
-	*error_r = t_strdup_printf("Unsupported dovecot key '%s'", field);
+	*error_r = t_strdup_printf("Unsupported field '%s'", field);
 	return -1;
 }
 
@@ -134,7 +134,7 @@ static int var_expand_env(const char *key, const char **value_r,
 			  void *context ATTR_UNUSED, const char **error_r)
 {
 	if (*key == '\0') {
-		*error_r = "Missing key";
+		*error_r = "Missing field";
 		return -1;
 	}