From: Otto Moerbeek <otto@drijf.net>
Date: Mon, 7 Dec 2020 12:26:02 +0000 (+0100)
Subject: Apply suggestions from code review
X-Git-Tag: rec-4.5.0-alpha1~79^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F9670%2Fhead;p=thirdparty%2Fpdns.git

Apply suggestions from code review

Co-authored-by: Remi Gacogne <rgacogne+github@valombre.net>
---

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index b6edf6b207..7532c8a487 100644
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -250,7 +250,7 @@ static void rpzPrimary(LuaConfigItems& lci, luaConfigDelayedThreads& delayedThre
       if(have.count("refresh")) {
         refresh = boost::get<uint32_t>(have["refresh"]);
         if (refresh == 0) {
-          g_log<<Logger::Warning<<"rpzMaster refresh value of 0 ignored"<<endl;
+          g_log<<Logger::Warning<<"rpzPrimary refresh value of 0 ignored"<<endl;
         }
       }
 
@@ -279,7 +279,7 @@ static void rpzPrimary(LuaConfigItems& lci, luaConfigDelayedThreads& delayedThre
       // We were passed a localAddress, check if its AF matches the masters'
       for (const auto& master : masters) {
         if (localAddress.sin4.sin_family != master.sin4.sin_family) {
-          throw PDNSException("Master address("+master.toString()+") is not of the same Address Family as the local address ("+localAddress.toString()+").");
+          throw PDNSException("Primary address("+master.toString()+") is not of the same Address Family as the local address ("+localAddress.toString()+").");
         }
       }
     }
@@ -308,11 +308,11 @@ static void rpzPrimary(LuaConfigItems& lci, luaConfigDelayedThreads& delayedThre
     }
   }
   catch(const std::exception& e) {
-    g_log<<Logger::Error<<"Problem configuring 'rpzMaster': "<<e.what()<<endl;
+    g_log<<Logger::Error<<"Problem configuring 'rpzPrimary': "<<e.what()<<endl;
     exit(1);  // FIXME proper exit code?
   }
   catch(const PDNSException& e) {
-    g_log<<Logger::Error<<"Problem configuring 'rpzMaster': "<<e.reason<<endl;
+    g_log<<Logger::Error<<"Problem configuring 'rpzPrimary': "<<e.reason<<endl;
     exit(1);  // FIXME proper exit code?
   }