From ff2e84e9fdcf062297ed51ab3aa714792c351e7a Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 24 Apr 2018 23:48:13 +0200
Subject: [PATCH] avoid interleaved access to B (via d_dk)

---
 pdns/packethandler.cc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 06d052630..9e2ca7e89 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
-- 
2.40.0