From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Mon, 3 Feb 2025 09:28:23 +0000 (+0200)
Subject: lib-var-expand: Prefix provider errors with provider prefix
X-Git-Tag: 2.4.1~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8832025364fc8d3aa9544d9d02e89cc705a24e9;p=thirdparty%2Fdovecot%2Fcore.git

lib-var-expand: Prefix provider errors with provider prefix
---

diff --git a/src/lib-var-expand/var-expand.c b/src/lib-var-expand/var-expand.c
index d1e3e20525..35955b2647 100644
--- a/src/lib-var-expand/var-expand.c
+++ b/src/lib-var-expand/var-expand.c
@@ -390,6 +390,9 @@ static int call_value_provider(const struct var_expand_state *state,
 	if (!found) {
 		*error_r = t_strdup_printf("Unsupported prefix '%s'", prefix);
 		ret = -1;
+	} else if (ret == -1) {
+		/* Add prefix to errors */
+		*error_r = t_strdup_printf("%s: %s", prefix, *error_r);
 	}
 
 	i_assert(*value_r != NULL || ret == -1);