From: Remi Gacogne Date: Thu, 21 Jun 2018 07:59:45 +0000 (+0200) Subject: Merge pull request #6495 from Habbie/parse-resolvconf-once X-Git-Tag: dnsdist-1.3.1~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b59f3ef9142d1a3ca3cefa445816615ca1a70934;p=thirdparty%2Fpdns.git Merge pull request #6495 from Habbie/parse-resolvconf-once only parse resolv.conf once - this avoids race conditions --- b59f3ef9142d1a3ca3cefa445816615ca1a70934 diff --cc pdns/lua-auth4.cc index d65d28862f,a028d62f7f..dae104b140 --- a/pdns/lua-auth4.cc +++ b/pdns/lua-auth4.cc @@@ -37,14 -27,9 +37,12 @@@ void AuthLua4::postLoad( #else -#include "ext/luawrapper/include/LuaContext.hpp" +LuaContext* AuthLua4::getLua() +{ + return d_lw.get(); +} void AuthLua4::postPrepareContext() { - stubParseResolveConf(); - d_lw->writeFunction("resolve", [](const std::string& qname, uint16_t qtype) { std::vector ret; std::unordered_map luaResult;