From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 20 Jan 2021 11:55:16 +0000 (+0100)
Subject: rename secondary-renotify to secondary-do-renotify
X-Git-Tag: dnsdist-1.6.0-rc1~32^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=577d732c73327064b473cc7ba0f27ef14222f7b2;p=thirdparty%2Fpdns.git

rename secondary-renotify to secondary-do-renotify
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 3635a66615..b100469407 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -189,7 +189,7 @@ void declareArguments()
 
   ::arg().set("trusted-notification-proxy", "IP address of incoming notification proxy")="";
   ::arg().set("slave-renotify", "If we should send out notifications for secondaried updates")="no";
-  ::arg().set("secondary-renotify", "If we should send out notifications for secondaried updates")="no";
+  ::arg().set("secondary-do-renotify", "If this secondary should send out notifications after receiving zone transfers from a primary")="no";
   ::arg().set("forward-notify", "IP addresses to forward received notifications to regardless of master or slave settings")="";
 
   ::arg().set("default-ttl","Seconds a result is valid if not set otherwise")="3600";
diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc
index d78f38ccc1..76cb927fc4 100644
--- a/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc
@@ -289,7 +289,7 @@ string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid)
   ostringstream os;
   if(parts.size()!=3)
     return "syntax: notify-host domain ip";
-  if(!::arg().mustDo("primary") && !(::arg().mustDo("secondary") && ::arg().mustDo("secondary-renotify")))
+  if(!::arg().mustDo("primary") && !(::arg().mustDo("secondary") && ::arg().mustDo("secondary-do-renotify")))
       return "PowerDNS not configured as primary (master), or secondary (slave) with re-notifications";
 
   DNSName domain;
@@ -317,7 +317,7 @@ string DLNotifyHandler(const vector<string>&parts, Utility::pid_t ppid)
   UeberBackend B;
   if(parts.size()!=2)
     return "syntax: notify domain";
-  if(!::arg().mustDo("primary") && !(::arg().mustDo("secondary") && ::arg().mustDo("secondary-renotify")))
+  if(!::arg().mustDo("primary") && !(::arg().mustDo("secondary") && ::arg().mustDo("secondary-do-renotify")))
       return "PowerDNS not configured as primary (master), or secondary (slave) with re-notifications";
   g_log<<Logger::Warning<<"Notification request for domain '"<<parts[1]<<"' received from operator"<<endl;
 
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 8d1d461e87..268713d543 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -429,13 +429,13 @@ int main(int argc, char **argv)
 
     if (::arg().mustDo("master")) ::arg().set("primary")="yes";
     if (::arg().mustDo("slave")) ::arg().set("secondary")="yes";
-    if (::arg().mustDo("slave-renotify")) ::arg().set("secondary-renotify")="yes";
+    if (::arg().mustDo("slave-renotify")) ::arg().set("secondary-do-renotify")="yes";
     if (::arg().mustDo("superslave")) ::arg().set("autosecondary")="yes";
 
     // this mirroring back is on purpose, so that config dumps reflect the actual setting on both names
     if (::arg().mustDo("primary")) ::arg().set("master")="yes";
     if (::arg().mustDo("secondary")) ::arg().set("slave")="yes";
-    if (::arg().mustDo("secondary-renotify")) ::arg().set("slave-renotify")="yes";
+    if (::arg().mustDo("secondary-do-renotify")) ::arg().set("slave-renotify")="yes";
     if (::arg().mustDo("autosecondary")) ::arg().set("superslave")="yes";
 
     g_log.setLoglevel((Logger::Urgency)(::arg().asNum("loglevel")));