From 8fb594baf334db781f81fb5d6ffccb2a4d1ac34d Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 30 Jul 2018 15:24:07 +0200
Subject: [PATCH] rec: Fix 'worker' conflict with #6812

---
 pdns/lua-recursor4.hh | 2 +-
 pdns/pdns_recursor.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pdns/lua-recursor4.hh b/pdns/lua-recursor4.hh
index 6c0bf7ce5..10928c5cd 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 64c4c1e96..b9e2ea30d 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>();
-- 
2.49.0