From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 26 Nov 2024 14:00:00 +0000 (+0200)
Subject: auth: Remove legacy passdb init and passdb_args setting
X-Git-Tag: 2.4.0~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0984ef2a7e28d3a519aad8d61c0b02696bd4ea84;p=thirdparty%2Fdovecot%2Fcore.git

auth: Remove legacy passdb init and passdb_args setting
---

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index d0ea898b48..5b373bf753 100644
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -106,7 +106,6 @@ const struct setting_keyvalue auth_worker_service_settings_defaults[] = {
 static const struct setting_define auth_passdb_setting_defines[] = {
 	DEF(STR, name),
 	DEF(STR, driver),
-	DEF(STR_NOVARS, args),
 	DEF(BOOL, fields_import_all),
 	DEF(BOOLLIST, mechanisms_filter),
 	DEF(STR, username_filter),
@@ -129,7 +128,6 @@ static const struct setting_define auth_passdb_setting_defines[] = {
 static const struct auth_passdb_settings auth_passdb_default_settings = {
 	.name = "",
 	.driver = "",
-	.args = "",
 	.fields_import_all = TRUE,
 	.mechanisms_filter = ARRAY_INIT,
 	.username_filter = "",
diff --git a/src/auth/auth-settings.h b/src/auth/auth-settings.h
index 3cc521a721..a49921484b 100644
--- a/src/auth/auth-settings.h
+++ b/src/auth/auth-settings.h
@@ -13,7 +13,6 @@ struct auth_passdb_settings {
 	pool_t pool;
 	const char *name;
 	const char *driver;
-	const char *args;
 	bool fields_import_all;
 	ARRAY_TYPE(const_string) mechanisms_filter;
 	const char *username_filter;
diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index 5d9602ed99..0dd9628131 100644
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -185,29 +185,18 @@ passdb_preinit(pool_t pool, struct event *event,
 		i_fatal("Support not compiled in for passdb driver '%s'",
 			set->driver);
 	}
-	if (iface->preinit_legacy == NULL && iface->init == NULL &&
-	    *set->args != '\0') {
-		i_fatal("passdb %s: No args are supported: %s",
-			set->driver, set->args);
-	}
 
 	if (iface->preinit != NULL) {
-		if (set->args[0] != '\0')
-			i_fatal("passdb %s: passdb_args must be empty", set->name);
 		if (iface->preinit(pool, event, &passdb, &error) < 0)
 			i_fatal("passdb %s: %s", set->name, error);
 		passdb->default_pass_scheme =
 			set->default_password_scheme;
 		passdb->blocking = set->use_worker;
 	} else {
-		if (iface->preinit_legacy == NULL)
-			passdb = p_new(pool, struct passdb_module, 1);
-		else
-			passdb = iface->preinit_legacy(pool, set->args);
+		passdb = p_new(pool, struct passdb_module, 1);
 	}
 	passdb->id = ++auth_passdb_id;
 	passdb->iface = *iface;
-	passdb->args = p_strdup(pool, set->args);
 	array_push_back(&passdb_modules, &passdb);
 	return passdb;
 }
diff --git a/src/auth/passdb.h b/src/auth/passdb.h
index 0404303a65..102df34c56 100644
--- a/src/auth/passdb.h
+++ b/src/auth/passdb.h
@@ -39,7 +39,6 @@ struct passdb_module_interface {
 	   given event. */
 	int (*preinit)(pool_t pool, struct event *event,
 		       struct passdb_module **module_r, const char **error_r);
-	struct passdb_module *(*preinit_legacy)(pool_t pool, const char *args);
 	void (*init)(struct passdb_module *module);
 	void (*deinit)(struct passdb_module *module);
 
@@ -59,7 +58,6 @@ struct passdb_module_interface {
 };
 
 struct passdb_module {
-	const char *args;
 	/* The default caching key for this module, or NULL if caching isn't
 	   wanted. This is updated by settings in auth_passdb. */
 	const char *default_cache_key;
diff --git a/src/auth/test-mock.c b/src/auth/test-mock.c
index d0e3562421..9a791e9c50 100644
--- a/src/auth/test-mock.c
+++ b/src/auth/test-mock.c
@@ -55,7 +55,6 @@ void passdb_mock_mod_init(void)
 	struct auth_passdb_settings set = {
 		.name = "mock",
 		.driver = "mock",
-		.args = "",
 		.mechanisms_filter = ARRAY_INIT,
 		.username_filter = "",