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 ad0cb39fd596fd59f0c7ba00ba3c123e1bcb7e4a..2c5c8260d9377dd445b24acd1f29c66cedadf830 100644 (file)
--- 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 f47037109536381e86e26f65e977b59d1ab4f40a..c799b60b5fdbb9247e4862a62e3f55e453f80566 100644 (file)
--- 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 49d100131394a942f168b32d0e32fbf63ec9825c..2f68a833f09ea46be0d7a823a1f85421231bf214 100644 (file)
--- 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 017be3a93573267dc973b0022132599811cbfe06..6ed4367ae80c38b856e28adb50b649403a632f1e 100644 (file)
--- 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;