From 352c726aaa8c072e82a2a32c8fb55e00e3d20dc5 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Mon, 1 Dec 2025 14:25:33 +0100 Subject: [PATCH] rec: move g_logRPZChanges to proper spot Signed-off-by: Otto Moerbeek --- pdns/recursordist/rec-main.cc | 1 - pdns/recursordist/rpzloader.cc | 2 ++ pdns/recursordist/test-rpzloader_cc.cc | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) 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> g_initialDomainMap; // new th LockGuarded> g_initialAllowFrom; // new thread needs to be setup with this LockGuarded> g_initialAllowNotifyFrom; // new threads need this to be setup LockGuarded> g_initialAllowNotifyFor; // new threads need this to be setup -bool g_logRPZChanges{false}; static time_t s_statisticsInterval; static std::atomic 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 -// Provide stubs for some symbols -bool g_logRPZChanges{false}; - BOOST_AUTO_TEST_SUITE(rpzloader_cc) BOOST_AUTO_TEST_CASE(test_rpz_loader) -- 2.47.3