From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 7 Jun 2023 09:42:48 +0000 (+0200)
Subject: Distinguish auto and manual disabling in logging
X-Git-Tag: rec-4.10.0-alpha0~2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d5aa757e9bc8ef3c054b7244178eb24da6b828a;p=thirdparty%2Fpdns.git

Distinguish auto and manual disabling in logging
---

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 8e80cefff4..1e3838baaf 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -1455,7 +1455,9 @@ static int initDNSSEC(Logr::log_t log)
   g_maxNSEC3Iterations = ::arg().asNum("nsec3-max-iterations");
 
   vector<string> nums;
+  bool automatic = true;
   if (!::arg()["dnssec-disabled-algorithms"].empty()) {
+    automatic = false;
     stringtok(nums, ::arg()["dnssec-disabled-algorithms"], ", ");
     for (auto num: nums) {
       DNSCryptoKeyEngine::switchOffAlgorithm(pdns::checked_stoi<unsigned int>(num));
@@ -1463,7 +1465,6 @@ static int initDNSSEC(Logr::log_t log)
   } else {
     for (auto algo : { DNSSECKeeper::RSASHA1, DNSSECKeeper::RSASHA1NSEC3SHA1 }) {
       if (!DNSCryptoKeyEngine::verifyOne(algo)) {
-        cerr << "XXXX " << algo << endl;
         DNSCryptoKeyEngine::switchOffAlgorithm(algo);
         nums.push_back(std::to_string(algo));
       }
@@ -1471,7 +1472,7 @@ static int initDNSSEC(Logr::log_t log)
   }
   if (!nums.empty()) {
     if (!g_slogStructured) {
-      g_log << Logger::Warning << "Disabled DNSSEC algorithm: ";
+      g_log << Logger::Warning << (automatic ? "Automatically" : "Manually") << " disabled DNSSEC algorithms: ";
       for (auto i = nums.begin(); i != nums.end(); ++i) {
         if (i != nums.begin()) {
           g_log << Logger::Warning << ", ";
@@ -1481,7 +1482,7 @@ static int initDNSSEC(Logr::log_t log)
       g_log << Logger::Warning << endl;
     }
     else {
-      log->info(Logr::Notice, "Disabled DNSSEC algorithms", "algorithms", Logging::IterLoggable(nums.begin(), nums.end()));
+      log->info(Logr::Notice, "Disabled DNSSEC algorithms", "automatically", Logging::Loggable(automatic), "algorithms", Logging::IterLoggable(nums.begin(), nums.end()));
     }
   }