From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 12 Feb 2019 11:23:00 +0000 (+0100)
Subject: meson: fix path to load modules
X-Git-Tag: v4.0.0~24^2~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44ed61ebae52b034cd84ef2f0880979ced1b4b5b;p=thirdparty%2Fknot-resolver.git

meson: fix path to load modules
---

diff --git a/daemon/engine.c b/daemon/engine.c
index 3ea25239f..344ab24b6 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -902,7 +902,7 @@ int engine_register(struct engine *engine, const char *name, const char *precede
 		return kr_error(ENOMEM);
 	}
 	module->data = engine;
-	int ret = kr_module_load(module, name, engine->moduledir);
+	int ret = kr_module_load(module, name, LIBDIR "/kres_modules");
 	/* Load Lua module if not a binary */
 	if (ret == kr_error(ENOENT)) {
 		ret = ffimodule_register_lua(engine, module, name);
diff --git a/daemon/ffimodule.c b/daemon/ffimodule.c
index 7e8424d22..69fc58805 100644
--- a/daemon/ffimodule.c
+++ b/daemon/ffimodule.c
@@ -261,7 +261,7 @@ int ffimodule_register_lua(struct engine *engine, struct kr_module *module, cons
 	/* Register module in Lua */
 	lua_State *L = engine->L;
 	lua_getglobal(L, "require");
-	lua_pushstring(L, name);
+	lua_pushfstring(L, "kres_modules.%s", name);
 	if (lua_pcall(L, 1, LUA_MULTRET, 0) != 0) {
 		fprintf(stderr, "error: %s\n", lua_tostring(L, -1));
 		lua_pop(L, 1);
diff --git a/daemon/lua/sandbox.lua b/daemon/lua/sandbox.lua
index 7b52224b0..017e3a399 100644
--- a/daemon/lua/sandbox.lua
+++ b/daemon/lua/sandbox.lua
@@ -316,13 +316,13 @@ end
 
 -- Load embedded modules
 trust_anchors = require('trust_anchors')
-modules.load('kres_modules.ta_signal_query')
-modules.load('kres_modules.policy')
-modules.load('kres_modules.priming')
-modules.load('kres_modules.detect_time_skew')
-modules.load('kres_modules.detect_time_jump')
-modules.load('kres_modules.ta_sentinel')
-modules.load('kres_modules.edns_keepalive')
+modules.load('ta_signal_query')
+modules.load('policy')
+modules.load('priming')
+modules.load('detect_time_skew')
+modules.load('detect_time_jump')
+modules.load('ta_sentinel')
+modules.load('edns_keepalive')
 
 -- Interactive command evaluation
 function eval_cmd(line, raw)