From: Markus Valentin <markus.valentin@open-xchange.com>
Date: Thu, 14 Mar 2024 10:05:27 +0000 (+0100)
Subject: auth: [user|pass]db-lua: Use dlua_script_create_auto()
X-Git-Tag: 2.4.1~921
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce67ed45a8243b89b84b545b43323e88432d1011;p=thirdparty%2Fdovecot%2Fcore.git

auth: [user|pass]db-lua: Use dlua_script_create_auto()
---

diff --git a/src/auth/db-lua.c b/src/auth/db-lua.c
index be9a4ce115..88c05958b0 100644
--- a/src/auth/db-lua.c
+++ b/src/auth/db-lua.c
@@ -49,13 +49,11 @@ static const struct setting_define auth_lua_setting_defines[] = {
 	{ .type = SET_FILTER_NAME, .key = "passdb_lua", },
 	{ .type = SET_FILTER_NAME, .key = "userdb_lua", },
 	DEF(STRLIST, auth_lua_config),
-	DEF(STR, auth_lua_file),
 
 	SETTING_DEFINE_LIST_END
 };
 
 static const struct auth_lua_settings auth_lua_default_settings = {
-	.auth_lua_file = "",
 	.auth_lua_config = ARRAY_INIT,
 };
 
diff --git a/src/auth/db-lua.h b/src/auth/db-lua.h
index cda1df1e7a..2b17bf0102 100644
--- a/src/auth/db-lua.h
+++ b/src/auth/db-lua.h
@@ -9,7 +9,6 @@ struct dlua_script;
 
 struct auth_lua_settings {
 	pool_t pool;
-	const char *auth_lua_file;
 	ARRAY_TYPE(const_string) auth_lua_config;
 };
 
@@ -18,13 +17,11 @@ extern const struct setting_parser_info auth_lua_setting_parser_info;
 struct dlua_passdb_module {
 	struct passdb_module module;
 	struct dlua_script *script;
-	const struct auth_lua_settings *set;
 	bool has_password_verify;
 };
 
 struct dlua_userdb_module {
 	struct userdb_module module;
-	const struct auth_lua_settings *set;
 	struct dlua_script *script;
 };
 
diff --git a/src/auth/passdb-lua.c b/src/auth/passdb-lua.c
index a8eb681315..dd73d436f2 100644
--- a/src/auth/passdb-lua.c
+++ b/src/auth/passdb-lua.c
@@ -108,22 +108,11 @@ static int
 passdb_lua_preinit(pool_t pool, struct event *event,
 		   struct passdb_module **module_r, const char **error_r)
 {
-	const struct auth_lua_settings *set;
 	struct dlua_passdb_module *module;
-
-	if (settings_get(event, &auth_lua_setting_parser_info, 0, &set,
-			 error_r) < 0) {
-		event_unref(&event);
-		return -1;
-	}
-
 	module = p_new(pool, struct dlua_passdb_module, 1);
-	module->set = set;
 
-	if (dlua_script_create_file(module->set->auth_lua_file, &module->script,
-				    event, error_r) < 0)
-		i_fatal("passdb-lua: failed to load '%s': %s",
-			module->set->auth_lua_file, *error_r);
+	if (dlua_script_create_auto(event, &module->script, error_r) <= 0)
+		i_fatal("passdb-lua: %s", *error_r);
 
 	const struct auth_lua_script_parameters params = {
 		.script = module->script,
@@ -164,7 +153,6 @@ static void passdb_lua_deinit(struct passdb_module *_module)
 	struct dlua_passdb_module *module =
 		(struct dlua_passdb_module *)_module;
 	dlua_script_unref(&module->script);
-	settings_free(module->set);
 }
 
 #ifndef PLUGIN_BUILD
diff --git a/src/auth/userdb-lua.c b/src/auth/userdb-lua.c
index 28c8f3e923..7f7dd65ce1 100644
--- a/src/auth/userdb-lua.c
+++ b/src/auth/userdb-lua.c
@@ -33,22 +33,12 @@ static int
 userdb_lua_preinit(pool_t pool, struct event *event,
 		   struct userdb_module **module_r, const char **error_r)
 {
-	const struct auth_lua_settings *set;
 	struct dlua_userdb_module *module;
 
-	if (settings_get(event, &auth_lua_setting_parser_info, 0, &set,
-			 error_r) < 0) {
-		event_unref(&event);
-		return -1;
-	}
-
 	module = p_new(pool, struct dlua_userdb_module, 1);
-	module->set = set;
 
-	if (dlua_script_create_file(module->set->auth_lua_file, &module->script,
-				    event, error_r) < 0)
-		i_fatal("userdb-lua: failed to load '%s': %s",
-			module->set->auth_lua_file, *error_r);
+	if (dlua_script_create_auto(event, &module->script, error_r) <= 0)
+		i_fatal("userdb-lua: %s", *error_r);
 
 	const struct auth_lua_script_parameters params = {
 		.script = module->script,
@@ -86,7 +76,6 @@ static void userdb_lua_deinit(struct userdb_module *_module)
 	struct dlua_userdb_module *module =
 		(struct dlua_userdb_module *)_module;
 	dlua_script_unref(&module->script);
-	settings_free(module->set);
 }
 
 static struct userdb_iterate_context *