From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 24 Apr 2018 21:48:13 +0000 (+0200)
Subject: avoid interleaved access to B (via d_dk)
X-Git-Tag: dnsdist-1.3.1~131^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6531%2Fhead;p=thirdparty%2Fpdns.git

avoid interleaved access to B (via d_dk)
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 06d0526302..9e2ca7e89e 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1340,13 +1340,6 @@ DNSPacket *PacketHandler::doQuestion(DNSPacket *p)
 
     DLOG(g_log<<"Got no referrals, trying ANY"<<endl);
 
-    // see what we get..
-    B.lookup(QType(QType::ANY), target, p, sd.domain_id);
-    rrset.clear();
-    haveAlias.trimToLabels(0);
-    weDone = weRedirected = weHaveUnauth =  false;
-
-
 #ifdef HAVE_LUA_RECORDS
     if(!doLua) {
       string val;
@@ -1354,6 +1347,12 @@ DNSPacket *PacketHandler::doQuestion(DNSPacket *p)
       doLua = (val=="1");
     }
 #endif
+
+    // see what we get..
+    B.lookup(QType(QType::ANY), target, p, sd.domain_id);
+    rrset.clear();
+    haveAlias.trimToLabels(0);
+    weDone = weRedirected = weHaveUnauth =  false;
     
     while(B.get(rr)) {
 #ifdef HAVE_LUA_RECORDS