From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 18 Sep 2024 11:13:21 +0000 (+0300)
Subject: auth: Rename passdb_mechanisms to passdb_mechanisms_filter
X-Git-Tag: 2.4.0~360
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ee25a56b520d1d82c61f1971ec8ab93f18d616b;p=thirdparty%2Fdovecot%2Fcore.git

auth: Rename passdb_mechanisms to passdb_mechanisms_filter

Rename also related variables.
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index e76e6da73c..45a0df1407 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -604,7 +604,7 @@ auth_request_want_skip_passdb(struct auth_request *request,
 			      struct auth_passdb *passdb)
 {
 	/* if mechanism is not supported, skip */
-	const char *const *mechs = passdb->mechanisms;
+	const char *const *mechs = passdb->mechanisms_filter;
 	const char *const *username_filter = passdb->username_filter;
 	const char *username;
 
diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index e00fdb716f..6436bc4a82 100644
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -108,7 +108,7 @@ static const struct setting_define auth_passdb_setting_defines[] = {
 	DEF(STR, driver),
 	DEF(STR_NOVARS, args),
 	DEF(BOOL, fields_import_all),
-	DEF(BOOLLIST, mechanisms),
+	DEF(BOOLLIST, mechanisms_filter),
 	DEF(STR, username_filter),
 
 	DEF(STR, default_password_scheme),
@@ -131,7 +131,7 @@ static const struct auth_passdb_settings auth_passdb_default_settings = {
 	.driver = "",
 	.args = "",
 	.fields_import_all = TRUE,
-	.mechanisms = ARRAY_INIT,
+	.mechanisms_filter = ARRAY_INIT,
 	.username_filter = "",
 
 	.default_password_scheme = "PLAIN",
diff --git a/src/auth/auth-settings.h b/src/auth/auth-settings.h
index 02ed9fd403..1aac6d6881 100644
--- a/src/auth/auth-settings.h
+++ b/src/auth/auth-settings.h
@@ -15,7 +15,7 @@ struct auth_passdb_settings {
 	const char *driver;
 	const char *args;
 	bool fields_import_all;
-	ARRAY_TYPE(const_string) mechanisms;
+	ARRAY_TYPE(const_string) mechanisms_filter;
 	const char *username_filter;
 
 	const char *default_password_scheme;
diff --git a/src/auth/auth.c b/src/auth/auth.c
index 9303dc1051..339d5d8938 100644
--- a/src/auth/auth.c
+++ b/src/auth/auth.c
@@ -103,11 +103,12 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *_set,
 	auth_passdb->result_internalfail =
 		auth_db_rule_parse(set->result_internalfail);
 
-	if (!array_is_created(&set->mechanisms) ||
-	    array_is_empty(&set->mechanisms)) {
-		auth_passdb->mechanisms = NULL;
+	if (!array_is_created(&set->mechanisms_filter) ||
+	    array_is_empty(&set->mechanisms_filter)) {
+		auth_passdb->mechanisms_filter = NULL;
 	} else {
-		auth_passdb->mechanisms = settings_boollist_get(&set->mechanisms);
+		auth_passdb->mechanisms_filter =
+			settings_boollist_get(&set->mechanisms_filter);
 	}
 
 	if (*set->username_filter == '\0') {
diff --git a/src/auth/auth.h b/src/auth/auth.h
index 2e1440f156..e6ebcd3799 100644
--- a/src/auth/auth.h
+++ b/src/auth/auth.h
@@ -40,8 +40,8 @@ struct auth_passdb {
 	/* The caching key for this passdb, or NULL if caching isn't wanted. */
 	const char *cache_key;
 
-	/* Supported authentication mechanisms, NULL is all, {NULL} is none */
-	const char *const *mechanisms;
+	/* Authentication mechanisms filter, NULL is all, {NULL} is none */
+	const char *const *mechanisms_filter;
 	/* Username filter, NULL is no filter */
 	const char *const *username_filter;
 
diff --git a/src/auth/test-mock.c b/src/auth/test-mock.c
index b0c1db4a02..d0e3562421 100644
--- a/src/auth/test-mock.c
+++ b/src/auth/test-mock.c
@@ -56,7 +56,7 @@ void passdb_mock_mod_init(void)
 		.name = "mock",
 		.driver = "mock",
 		.args = "",
-		.mechanisms = ARRAY_INIT,
+		.mechanisms_filter = ARRAY_INIT,
 		.username_filter = "",
 
 		.skip = "never",