From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 24 Nov 2021 09:36:30 +0000 (+0100)
Subject: dnsdist: Apply Charles-Henri's suggestions from code review (thanks!)
X-Git-Tag: dnsdist-1.7.0-beta2~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11006%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Apply Charles-Henri's suggestions from code review (thanks!)
---

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 5633307d14..ebd48fb6fc 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -1053,7 +1053,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
 
   luaCtx.writeFunction("showWebserverConfig", []() {
     setLuaNoSideEffect();
-    return getWebServerConfig();
+    return getWebserverConfig();
   });
 
   luaCtx.writeFunction("hashPassword", [](const std::string& password, boost::optional<uint64_t> workFactor) {
diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc
index 76f772b704..81c81d88bc 100644
--- a/pdns/dnsdist-web.cc
+++ b/pdns/dnsdist-web.cc
@@ -64,7 +64,7 @@ static const MetricDefinitionStorage s_metricDefinitions;
 
 static ConcurrentConnectionManager s_connManager(100);
 
-std::string getWebServerConfig()
+std::string getWebserverConfig()
 {
   ostringstream out;
 
@@ -74,14 +74,14 @@ std::string getWebServerConfig()
     out << "ACL: " << config->acl.toString() << endl;
     out << "Custom headers: ";
     if (config->customHeaders) {
+      out << endl;
       for (const auto& header : *config->customHeaders) {
         out << " - " << header.first << ": " << header.second << endl;
       }
     }
     else {
-      out << "None";
+      out << "None" << endl;
     }
-    out << endl;
     out << "Statistics require authentication: " << (config->statsRequireAuthentication ? "yes" : "no") << endl;
     out << "Password: " << (config->password ? "set" : "unset") << endl;
     out << "API key: " << (config->apiKey ? "set" : "unset") << endl;
diff --git a/pdns/dnsdistdist/dnsdist-web.hh b/pdns/dnsdistdist/dnsdist-web.hh
index a4f30fc80d..c119eee11d 100644
--- a/pdns/dnsdistdist/dnsdist-web.hh
+++ b/pdns/dnsdistdist/dnsdist-web.hh
@@ -14,4 +14,4 @@ void dnsdistWebserverThread(int sock, const ComboAddress& local);
 void registerBuiltInWebHandlers();
 void clearWebHandlers();
 
-std::string getWebServerConfig();
+std::string getWebserverConfig();