From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 19 Sep 2024 05:38:51 +0000 (+0300)
Subject: auth: passwd-file - Add all fields to passwd_file provider
X-Git-Tag: 2.4.1~579
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585c1fdcfd5a640f018fe5328fb4d05af1701d59;p=thirdparty%2Fdovecot%2Fcore.git

auth: passwd-file - Add all fields to passwd_file provider
---

diff --git a/src/auth/passdb-passwd-file.c b/src/auth/passdb-passwd-file.c
index 0a45f96429..14daf7e51b 100644
--- a/src/auth/passdb-passwd-file.c
+++ b/src/auth/passdb-passwd-file.c
@@ -51,8 +51,7 @@ passwd_file_add_extra_fields(struct auth_request *request,
 		}
 		if (request->passdb->set->fields_import_all)
 			auth_request_set_field(request, key, value, NULL);
-		if (!str_begins_with(fields[i], "userdb_"))
-			auth_fields_add(pwd_fields, key, value, 0);
+		auth_fields_add(pwd_fields, key, value, 0);
 	}
 
 	if (ret == 0 && auth_request_set_passdb_fields_ex(request, pwd_fields, "PLAIN",
diff --git a/src/auth/userdb-passwd-file.c b/src/auth/userdb-passwd-file.c
index 94973ba415..b3ed1a3ca4 100644
--- a/src/auth/userdb-passwd-file.c
+++ b/src/auth/userdb-passwd-file.c
@@ -41,9 +41,7 @@ passwd_file_add_extra_fields(struct auth_request *request,
 	table = auth_request_get_var_expand_table(request);
 
 	for (i = 0; fields[i] != NULL; i++) {
-		if (!str_begins(fields[i], "userdb_", &key))
-			continue;
-
+		key = fields[i];
 		value = strchr(key, '=');
 		if (value != NULL) {
 			key = t_strdup_until(key, value);
@@ -60,7 +58,8 @@ passwd_file_add_extra_fields(struct auth_request *request,
 		} else {
 			value = "";
 		}
-		if (request->userdb->set->fields_import_all)
+		if (request->userdb->set->fields_import_all &&
+		    str_begins(key, "userdb_", &key))
 			auth_request_set_userdb_field(request, key, value);
 		auth_fields_add(pwd_fields, key, value, 0);
 	}