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

auth: Remove duplicate prefix from providers
---

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index d12a1575e0..8af9696da8 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1287,7 +1287,7 @@ db_ldap_field_multi_expand(const char *data, const char **value_r,
 		value = auth_fields_find(fields, field_name);
 
 	if (value == NULL || *value == '\0') {
-		*error_r = t_strdup_printf("No such LDAP attribute '%s'", field_name);
+		*error_r = t_strdup_printf("No such attribute '%s'", field_name);
 		return -1;
 	}
 	*value_r = value;
@@ -1314,7 +1314,7 @@ db_ldap_field_single_expand(const char *data, const char **value_r,
 		*value_r = auth_fields_find(fields, field_name);
 
 	if (*value_r == NULL || **value_r == '\0') {
-		*error_r = t_strdup_printf("No such LDAP attribute '%s'", field_name);
+		*error_r = t_strdup_printf("No such attribute '%s'", field_name);
 		return -1;
 	} else if (auth_fields_find(fields,
 				  db_ldap_attribute_as_multi(field_name)) != NULL) {
diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c
index 61a1720e46..5af92b9443 100644
--- a/src/auth/db-oauth2.c
+++ b/src/auth/db-oauth2.c
@@ -370,7 +370,7 @@ static int db_oauth2_var_expand_func_oauth2(const char *field_name,
 		*value_r = auth_fields_find(ctx->fields, field_name);
 		return 0;
 	} else {
-		*error_r = t_strdup_printf("OAuth2 field '%s' not found", field_name);
+		*error_r = t_strdup_printf("Field '%s' not found", field_name);
 		return -1;
 	}
 	*value_r = value;