Report auth settings deprecated in 4.5

diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index 5021c714dda648ab2b2fe7a957ab3a97e35495fd..fc65427a014880bfcc7e0c2e7986e2556be83660 100644 (file)
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -97,7 +97,7 @@ Renamed options
 ~~~~~~~~~~~~~~~
 
 Various settings have been renamed.
-Their old names still work in 4.5.x, but will be removed in the release after it.
+Their old names still work in 4.5.x, but will be removed in a release after it.
 
 * :ref:`setting-allow-unsigned-supermaster` is now :ref:`setting-allow-unsigned-autoprimary`
 * :ref:`setting-master` is now :ref:`setting-primary`

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index a1081ddd704eaa42418f58910c187e365ac5bbe1..35c1eb001a7b6be43793147bf844fb28d8ad2c94 100644 (file)
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -364,6 +364,13 @@ static const map<string, string> deprecateList = {
   {"snmp-master-socket", "snmp-daemon-socket"},
   {"xpf-allow-from", "Proxy Protocol"},
   {"xpf-rr-code", "Proxy Protocol"},
+  {"allow-unsigned-supermaster", "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"},
 };
 
 void ArgvMap::warnIfDeprecated(const string& var)