From: Markus Valentin <markus.valentin@open-xchange.com>
Date: Wed, 21 Feb 2024 12:16:57 +0000 (+0100)
Subject: auth: db-lua - Split off auth_lua_script_auth_db_init() from auth_lua_script_init()
X-Git-Tag: 2.4.0~657
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f03ba2530de9292081c9881ff0106c9113319cb;p=thirdparty%2Fdovecot%2Fcore.git

auth: db-lua - Split off auth_lua_script_auth_db_init() from auth_lua_script_init()
---

diff --git a/src/auth/db-lua.c b/src/auth/db-lua.c
index cba551e1e2..3386a42469 100644
--- a/src/auth/db-lua.c
+++ b/src/auth/db-lua.c
@@ -478,6 +478,14 @@ int auth_lua_script_init(const struct auth_lua_script_parameters *params,
 	auth_lua_auth_request_register(script->L);
 	if (dlua_script_init(script, error_r) < 0)
 		return -1;
+
+	return 0;
+}
+
+int auth_lua_script_auth_db_init(const struct auth_lua_script_parameters *params,
+			         const char **error_r)
+{
+	struct dlua_script *script = params->script;
 	const char *fn;
 	switch (params->stype) {
 	case AUTH_LUA_SCRIPT_TYPE_PASSDB:
diff --git a/src/auth/db-lua.h b/src/auth/db-lua.h
index 277f7e5c6d..1962bc6d67 100644
--- a/src/auth/db-lua.h
+++ b/src/auth/db-lua.h
@@ -28,6 +28,9 @@ struct auth_lua_script_parameters {
 	const char *const *arguments;
 };
 
+int
+auth_lua_script_auth_db_init(const struct auth_lua_script_parameters *params,
+			     const char **error_r);
 int auth_lua_script_init(const struct auth_lua_script_parameters *params,
 		         const char **error_r);
 
diff --git a/src/auth/passdb-lua.c b/src/auth/passdb-lua.c
index 17be5b14f4..e7892bcfda 100644
--- a/src/auth/passdb-lua.c
+++ b/src/auth/passdb-lua.c
@@ -153,6 +153,8 @@ static void passdb_lua_init(struct passdb_module *_module)
 		.arguments = module->arguments,
 	};
 	if (auth_lua_script_init(&params, &error) < 0)
+		i_fatal("passdb-lua: script_init() failed: %s", error);
+	if (auth_lua_script_auth_db_init(&params, &error) < 0)
 		i_fatal("passdb-lua: auth_passdb_init() failed: %s", error);
 
 	module->has_password_verify =
diff --git a/src/auth/userdb-lua.c b/src/auth/userdb-lua.c
index 66ac75fa2f..6138ab726d 100644
--- a/src/auth/userdb-lua.c
+++ b/src/auth/userdb-lua.c
@@ -77,6 +77,8 @@ static void userdb_lua_init(struct userdb_module *_module)
 		.arguments = module->arguments,
 	};
 	if (auth_lua_script_init(&params, &error) < 0)
+		i_fatal("userdb-lua: script_init() failed: %s", error);
+	if (auth_lua_script_auth_db_init(&params, &error) < 0)
 		i_fatal("userdb-lua: auth_userdb_init() failed: %s", error);
 }