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 e76e6da73cc1cd98938d8c4b66edccccd75e5f94..45a0df1407858b91398e96e7716f6e80680192ef 100644 (file)
--- 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 e00fdb716f8c468be3602945836dfc9912185e77..6436bc4a821294fbc0afbd55f2d070d15aab81d3 100644 (file)
--- 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 02ed9fd403cc398c3a80947e4e2f8ae8df343c1f..1aac6d68818a8bd1320b8ba2f2f728b7f5abd6c7 100644 (file)
--- 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 9303dc105148d2937189a8c6189ed9570574b45e..339d5d8938c0f14fc0a075d784294d72360270e1 100644 (file)
--- 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 2e1440f15628230a48ecad47ae99bfaa8c200509..e6ebcd37999b42b80ca64e39a26ccafdf7150192 100644 (file)
--- 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 b0c1db4a022f4e16303d5e857b6435e6251ada2e..d0e3562421920ab646108e783ad2abc65614d698 100644 (file)
--- 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",