meson: fix path to load modules

diff --git a/daemon/engine.c b/daemon/engine.c
index 3ea25239f16b90083ac6f06533647c97fd69a13d..344ab24b60adecf675a97de54e065bd3e5e9038d 100644 (file)
--- 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 7e8424d22259345c70ba47b699481ca195e3c52f..69fc5880556e3412e7ffe7622293d8de2a71ec8a 100644 (file)
--- 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 7b52224b0c9ef632152d5349f0abe0705ec8487d..017e3a39936ce61df81ec218c6f80b77ca869e25 100644 (file)
--- 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)