Fixes from code review by @rgacogne

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 f272dff790fd715a86f1fb5329dd2cf404b6edb1..55149fa15c072e6516bea3022bf9c2c4d83267bf 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2124,7 +2124,6 @@ static int serviceMain(Logr::log_t log)
   }
   g_maxCacheEntries = ::arg().asNum("max-cache-entries");
 
-  cerr << "CALL LUACONFIG" << endl;
   auto luaResult = luaconfig(false);
   if (luaResult.d_ret != 0) {
     log->error(Logr::Error, luaResult.d_str, "Cannot load Lua or equivalent YAML configuration");

diff --git a/pdns/tcpiohandler.cc b/pdns/tcpiohandler.cc
index 0d034e0326c5b77534f1b20bdabf853ae5c80996..3dfd588246313481f10aea2dfa63c4c3f8e21911 100644 (file)
--- a/pdns/tcpiohandler.cc
+++ b/pdns/tcpiohandler.cc
@@ -42,7 +42,7 @@ bool shouldDoVerboseLogging()
 #ifdef DNSDIST
   return dnsdist::configuration::getCurrentRuntimeConfiguration().d_verbose;
 #elif defined(RECURSOR)
-  return true;
+  return false;
 #else
   return true;
 #endif
@@ -575,10 +575,10 @@ public:
           X509_free(cert);
         }
       }
-      const auto* errorMsg = X509_verify_cert_error_string(errorCode);
       if (!certPresented) {
         return {-1, "No certificate presented by peer"};
       }
+      const auto* errorMsg = X509_verify_cert_error_string(errorCode);
       return {errorCode, errorMsg != nullptr ? errorMsg : "No details available"};
     }
     return {0, ""};