From: Marek Vavrusa <marek@vavrusa.com>
Date: Wed, 8 Jun 2016 07:05:00 +0000 (-0700)
Subject: daemon/engine: prefer local import path first
X-Git-Tag: v1.1.0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7603d1866d194f66baf7ceeae5bc3b4b2f9780be;p=thirdparty%2Fknot-resolver.git

daemon/engine: prefer local import path first
---

diff --git a/daemon/engine.c b/daemon/engine.c
index 7f1529f56..f9c6d4489 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -571,7 +571,7 @@ int engine_cmd(struct engine *engine, const char *str)
 static int engine_loadconf(struct engine *engine, const char *config_path)
 {
 	/* Use module path for including Lua scripts */
-	static const char l_paths[] = "package.path = package.path..';" MODULEDIR "/?.lua'";
+	static const char l_paths[] = "package.path = '" MODULEDIR "/?.lua;'..package.path";
 	int ret = l_dobytecode(engine->L, l_paths, sizeof(l_paths) - 1, "");
 	if (ret != 0) {
 		lua_pop(engine->L, 1);
@@ -770,6 +770,6 @@ struct engine *engine_luaget(lua_State *L)
 {
 	lua_getglobal(L, "__engine");
 	struct engine *engine = lua_touserdata(L, -1);
-	lua_pop(engine->L, 1);
+	lua_pop(L, 1);
 	return engine;
 }