From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 30 Jul 2018 13:24:07 +0000 (+0200)
Subject: rec: Fix 'worker' conflict with #6812
X-Git-Tag: dnsdist-1.3.3~173^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6768%2Fhead;p=thirdparty%2Fpdns.git

rec: Fix 'worker' conflict with #6812
---

diff --git a/pdns/lua-recursor4.hh b/pdns/lua-recursor4.hh
index 6c0bf7ce5f..10928c5cd9 100644
--- a/pdns/lua-recursor4.hh
+++ b/pdns/lua-recursor4.hh
@@ -38,7 +38,7 @@
 #include "lua-recursor4-ffi.hh"
 
 string GenUDPQueryResponse(const ComboAddress& dest, const string& query);
-int getRecursorThreadId();
+unsigned int getRecursorThreadId();
 
 // pdns_ffi_param_t is a lightuserdata
 template<>
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 64c4c1e965..b9e2ea30d4 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -318,7 +318,7 @@ ArgvMap &arg()
   return theArg;
 }
 
-int getRecursorThreadId()
+unsigned int getRecursorThreadId()
 {
   return t_id;
 }
@@ -3694,7 +3694,7 @@ try
   setupNODThread();
 #endif /* NOD_ENABLED */
   
-  if(worker && (!g_weDistributeQueries || t_id != s_distributorThreadID)) {
+  if(threadInfo.isWorker) {
     try {
       if(!::arg()["lua-dns-script"].empty()) {
         t_pdl = std::make_shared<RecursorLua4>();