rec: move g_logRPZChanges to proper spot

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index b208fa29f93ce35ac24d2d69821daa7ac7755fc1..45e5217a0f7464834d4646fc72d4cdb1a04cfd71 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -116,7 +116,6 @@ LockGuarded<std::shared_ptr<SyncRes::domainmap_t>> g_initialDomainMap; // new th
 LockGuarded<std::shared_ptr<NetmaskGroup>> g_initialAllowFrom; // new thread needs to be setup with this
 LockGuarded<std::shared_ptr<NetmaskGroup>> g_initialAllowNotifyFrom; // new threads need this to be setup
 LockGuarded<std::shared_ptr<notifyset_t>> g_initialAllowNotifyFor; // new threads need this to be setup
-bool g_logRPZChanges{false};
 static time_t s_statisticsInterval;
 static std::atomic<uint32_t> s_counter;
 int g_argc;

diff --git a/pdns/recursordist/rpzloader.cc b/pdns/recursordist/rpzloader.cc
index 24dec5abe15903c637a3452a1281a83f6aa82113..834410176f28d74b5e4ed5df65586593f612be4f 100644 (file)
--- a/pdns/recursordist/rpzloader.cc
+++ b/pdns/recursordist/rpzloader.cc
@@ -34,6 +34,8 @@
 #include "query-local-address.hh"
 #include "rec-system-resolve.hh"
 
+bool g_logRPZChanges{false};
+
 Netmask makeNetmaskFromRPZ(const DNSName& name)
 {
   auto parts = name.getRawLabels();

diff --git a/pdns/recursordist/test-rpzloader_cc.cc b/pdns/recursordist/test-rpzloader_cc.cc
index d1a9bf42f8c223b74e4f76f2bbc0671909606fd3..6ca1bd2811f259918b1295fe45da5abe5c5849e7 100644 (file)
--- a/pdns/recursordist/test-rpzloader_cc.cc
+++ b/pdns/recursordist/test-rpzloader_cc.cc
@@ -12,9 +12,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-// Provide stubs for some symbols
-bool g_logRPZChanges{false};
-
 BOOST_AUTO_TEST_SUITE(rpzloader_cc)
 
 BOOST_AUTO_TEST_CASE(test_rpz_loader)