]> granicus.if.org Git - pdns/commitdiff
Merge pull request #6495 from Habbie/parse-resolvconf-once
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Thu, 21 Jun 2018 07:59:45 +0000 (09:59 +0200)
committerGitHub <noreply@github.com>
Thu, 21 Jun 2018 07:59:45 +0000 (09:59 +0200)
only parse resolv.conf once - this avoids race conditions

1  2 
pdns/lua-auth4.cc
pdns/stubresolver.cc

index d65d28862f892a54d5bcc8278289ac660cea849d,a028d62f7f53c2e400f94edba96aa5f69b4c997d..dae104b14032b784aa4c6f6782cf235bccbf7312
@@@ -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<DNSZoneRecord> ret;
        std::unordered_map<int, DNSResourceRecord> luaResult;
Simple merge