]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #10653 from rgacogne/lock-guarded-auth
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Fri, 17 Sep 2021 12:50:02 +0000 (14:50 +0200)
committerGitHub <noreply@github.com>
Fri, 17 Sep 2021 12:50:02 +0000 (14:50 +0200)
auth: Convert locks to LockGuarded

1  2 
pdns/cachecleaner.hh
pdns/lock.hh
pdns/lua-auth4.cc
pdns/lua-record.cc
pdns/tcpreceiver.cc
pdns/tcpreceiver.hh

Simple merge
diff --cc pdns/lock.hh
Simple merge
Simple merge
Simple merge
index dfd5340cb3c9006fe8a0e8d7f6744c125ee87e0e,716236febc40e01011b282ab68c97dfb94d069a8..aa381b8fe9ebca377059eafe172ee2b39b9347ef
@@@ -484,10 -434,10 +485,10 @@@ bool TCPNameserver::canDoAXFR(std::uniq
            nsset.insert(DNSName(rr.content));
          }
          for(const auto & j: nsset) {
-           vector<string> nsips=fns.lookup(j, s_P->getBackend());
+           vector<string> nsips=fns.lookup(j, packetHandler->getBackend());
            for(const auto & nsip : nsips) {
              // cerr<<"got "<<*k<<" from AUTO-NS"<<endl;
 -            if(nsip == q->getRemote().toString())
 +            if(nsip == q->getInnerRemote().toString())
              {
                // cerr<<"got AUTO-NS hit"<<endl;
                g_log<<Logger::Notice<<logPrefix<<"allowed: client IP is in NSset"<<endl;
Simple merge