From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 8 Nov 2023 14:53:28 +0000 (+0100)
Subject: auth: cleanup deprecated arguments
X-Git-Tag: rec-5.0.0-rc1~45^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dda11ae26eb989aa7014706c07015f468ce1e0b;p=thirdparty%2Fpdns.git

auth: cleanup deprecated arguments
---

diff --git a/docs/backends/bind.rst b/docs/backends/bind.rst
index 19d7021606..dc787c76cd 100644
--- a/docs/backends/bind.rst
+++ b/docs/backends/bind.rst
@@ -108,10 +108,15 @@ Store DNSSEC keys and metadata storage in another backend. See the
 Setting this option to ``yes`` makes PowerDNS ignore out of zone records
 when loading zone files.
 
-.. _setting-bind-supermasters:
+Autoprimary support (experimental)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``bind-supermasters``
-~~~~~~~~~~~~~~~~~~~~~
+.. _setting-bind-autoprimaries:
+
+``bind-autoprimaries``
+~~~~~~~~~~~~~~~~~~~~~~
+
+Changed in version 4.9.0: This was called ``bind-supermasters`` before 4.9.0.
 
 Specifies file where to read list of autoprimaries.
 BIND backend only checks IP address of primary server.
@@ -120,20 +125,24 @@ The file must contain one IP and account per line, separated by whitespace.
 
 BIND backend can only read this file, not write it.
 
-.. _setting-bind-supermaster-config:
+.. _setting-bind-autoprimary-config:
 
-``bind-supermaster-config``
+``bind-autoprimary-config``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Changed in version 4.9.0: This was called ``bind-supermaster-config`` before 4.9.0.
+
 When a new zone is configured via the autosecondary mechanism, bindbackend *writes* a zone entry to this file.
 
 Your ``bind-config`` file should have an ``include`` statement to make sure this file is read on startup.
 
-.. _setting-bind-supermaster-destdir:
+.. _setting-bind-autoprimary-destdir:
 
-``bind-supermaster-destdir``
+``bind-autoprimary-destdir``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Changed in version 4.9.0: This was called ``bind-supermaster-destdir`` before 4.9.0.
+
 Each new zone configured via the autosecondary mechanism gets a zone file in this directory.
 This directory must be writable.
 
diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index aacd60b90f..d0a4ec7767 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -359,12 +359,6 @@ static const map<string, string> deprecateList = {
   {"snmp-master-socket", "snmp-daemon-socket"},
   {"xpf-allow-from", "Proxy Protocol"},
   {"xpf-rr-code", "Proxy Protocol"},
-  {"allow-unsigned-autoprimary", "allow-unsigned-autoprimary"},
-  {"master", "primary"},
-  {"slave-cycle-interval", "xfr-cycle-interval"},
-  {"slave-renotify", "secondary-do-renotify"},
-  {"slave", "secondary"},
-  {"superslave", "autosecondary"},
   {"domain-metadata-cache-ttl", "zone-metadata-cache-ttl"},
 };
 
diff --git a/pdns/auth-secondarycommunicator.cc b/pdns/auth-secondarycommunicator.cc
index 5c5305c2d9..9b76a66526 100644
--- a/pdns/auth-secondarycommunicator.cc
+++ b/pdns/auth-secondarycommunicator.cc
@@ -961,7 +961,7 @@ void CommunicatorClass::suck(const DNSName& domain, const ComboAddress& remote,
       doNotify = (meta.front() == "1");
     }
     else {
-      doNotify = (::arg().mustDo("slave-renotify"));
+      doNotify = (::arg().mustDo("secondary-do-renotify"));
     }
     if (doNotify) {
       notifyDomain(domain, &B);