From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 1 Dec 2025 13:25:33 +0000 (+0100)
Subject: rec: move g_logRPZChanges to proper spot
X-Git-Tag: rec-5.4.0-alpha1~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16580%2Fhead;p=thirdparty%2Fpdns.git

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 b208fa29f9..45e5217a0f 100644
--- 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 24dec5abe1..834410176f 100644
--- 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 d1a9bf42f8..6ca1bd2811 100644
--- 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)