]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
daemon/lua: disabled syntactic sugar, as the getenvf is not in Lua 5.2
authorMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 1 Apr 2015 14:29:29 +0000 (16:29 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 1 Apr 2015 14:29:29 +0000 (16:29 +0200)
daemon/engine.c
daemon/lua/init.lua

index 8617207291b602b1e7914ef8655055448e8f8574..8d33a4d2f77c4c7b2dad3acda7ec3446e54e0424 100644 (file)
@@ -199,6 +199,8 @@ static int engine_loadconf(struct engine *engine)
                #include "daemon/lua/init.inc"
        };
        if (luaL_dostring(engine->L, l_init) != 0) {
+               fprintf(stderr, "[system] error %s\n", lua_tostring(engine->L, -1));
+               lua_pop(engine->L, 1);
                return kr_error(ENOEXEC);
        }
 
@@ -216,7 +218,7 @@ static int engine_loadconf(struct engine *engine)
 
        /* Evaluate */
        if (ret != 0) {
-               fprintf(stderr, "error: %s\n", lua_tostring(engine->L, -1));
+               fprintf(stderr, "[system] error %s\n", lua_tostring(engine->L, -1));
                lua_pop(engine->L, 1);
                return kr_error(EINVAL);
        }
index e71b08720aa8fa0f7dec5644734a895d5572e2c2..8792674366b7a6424c49a8c5a64fe2e4ac80645e 100644 (file)
@@ -28,5 +28,5 @@ function protect(defined)
                end
        })
 end
-_G = protect(getfenv(0))
-setfenv(0, _G)
+-- _G = protect(getfenv(0))
+-- setfenv(0, _G)