From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 17 Jan 2023 09:59:04 +0000 (+0100)
Subject: Remove remains of g_dnssecLOG
X-Git-Tag: dnsdist-1.8.0-rc1~83^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f019f773cbbc0aacf02f221d8d0b5d46c38a1667;p=thirdparty%2Fpdns.git

Remove remains of g_dnssecLOG

It was never set from !recursor and has the same value as trace in
rec.  Now validationo logging goes the same  as other trace handling,
so trace-regex also shows validation.
---

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index ad0cb39fd5..2c5c8260d9 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -1498,7 +1498,6 @@ static int serviceMain(int argc, char* argv[], Logr::log_t log)
     SyncRes::setDefaultLogMode(SyncRes::Log);
     ::arg().set("quiet") = "no";
     g_quiet = false;
-    g_dnssecLOG = true;
   }
   auto myHostname = getHostname();
   if (!myHostname.has_value()) {
diff --git a/pdns/recursordist/test-syncres_cc.cc b/pdns/recursordist/test-syncres_cc.cc
index f470371095..c799b60b5f 100644
--- a/pdns/recursordist/test-syncres_cc.cc
+++ b/pdns/recursordist/test-syncres_cc.cc
@@ -208,7 +208,6 @@ void initSR(bool debug)
   g_luaconfs.setState(luaconfsCopy);
 
   g_dnssecmode = DNSSECMode::Off;
-  g_dnssecLOG = debug;
   g_maxNSEC3Iterations = 2500;
 
   g_aggressiveNSECCache.reset();
diff --git a/pdns/validate.cc b/pdns/validate.cc
index 49d1001313..2f68a833f0 100644
--- a/pdns/validate.cc
+++ b/pdns/validate.cc
@@ -5,12 +5,13 @@
 #include "rec-lua-conf.hh"
 #include "base32.hh"
 #include "logger.hh"
-bool g_dnssecLOG{false};
+
 time_t g_signatureInceptionSkew{0};
 uint16_t g_maxNSEC3Iterations{0};
 
 #ifndef RECURSOR
-#define LOG(x) if(g_dnssecLOG) { g_log <<Logger::Warning << x; }
+// Originally there was a flag but is was never set from !RECURSOR
+#define LOG(x) if (false) g_log <<Logger::Warning << x
 #else
 #define LOG(x)                                                          \
   if (log) {                                                            \
diff --git a/pdns/validate.hh b/pdns/validate.hh
index 017be3a935..6ed4367ae8 100644
--- a/pdns/validate.hh
+++ b/pdns/validate.hh
@@ -29,7 +29,6 @@
 #include "dnssecinfra.hh"
 #include "logger.hh"
 
-extern bool g_dnssecLOG;
 extern time_t g_signatureInceptionSkew;
 extern uint16_t g_maxNSEC3Iterations;