rename allow-unsigned-supermaster

diff --git a/docs/settings.rst b/docs/settings.rst
index 2a452cb7444420e78a58701f4258810ee568cd9a..b1090562e6e355f7c8c19c3e5237558eb77894ed 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -61,6 +61,20 @@ Allow DNS updates from these IP ranges. Set to empty string to honour ``ALLOW-DN
 Allow AXFR NOTIFY from these IP ranges. Setting this to an empty string
 will drop all incoming notifies.
 
+.. _setting-allow-unsigned-autoprimary:
+
+``allow-unsigned-autoprimary``
+------------------------------
+
+.. versionchanged:: 4.5.0
+  This was called :ref:`setting-allow-unsigned-supermaster` before 4.5.0.
+
+-  Boolean
+-  Default: yes
+
+Turning this off requires all autoprimary notifications to be signed by
+valid TSIG signature. It will accept any existing key on slave.
+
 .. _setting-allow-unsigned-notify:
 
 ``allow-unsigned-notify``
@@ -77,11 +91,8 @@ signed by valid TSIG signature for the zone.
 ``allow-unsigned-supermaster``
 ------------------------------
 
--  Boolean
--  Default: yes
-
-Turning this off requires all supermaster notifications to be signed by
-valid TSIG signature. It will accept any existing key on slave.
+.. deprecated:: 4.5.0
+  Renamed to :ref:`setting-allow-unsigned-autoprimary`.
 
 .. _setting-also-notify:
 

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 35d3866024a91701490201469d3010b3d55c2a6f..5f42649e74f656991b86208cf743b4176b3da18c 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -94,6 +94,7 @@ void declareArguments()
   ::arg().setSwitch("send-signed-notify","Send TSIG secured NOTIFY if TSIG key is configured for a domain")="yes";
   ::arg().set("allow-unsigned-notify","Allow unsigned notifications for TSIG secured domains")="yes"; //FIXME: change to 'no' later
   ::arg().set("allow-unsigned-supermaster", "Allow supermasters to create zones without TSIG signed NOTIFY")="yes";
+  ::arg().set("allow-unsigned-autoprimary", "Allow autoprimaries to create zones without TSIG signed NOTIFY")="yes";
   ::arg().setSwitch("forward-dnsupdate","A global setting to allow DNS update packages that are for a Slave domain, to be forwarded to the master.")="yes";
   ::arg().setSwitch("log-dns-details","If PDNS should log DNS non-erroneous details")="no";
   ::arg().setSwitch("log-dns-queries","If PDNS should log all incoming DNS queries")="no";

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index f7fa4eb030ab54f4e25fed1c424cb002825c1109..463799d9913143dcf7c5aec9c71dc3ca28d904fc 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -920,7 +920,7 @@ int PacketHandler::trySuperMasterSynchronous(const DNSPacket& p, const DNSName&
   string nameserver, account;
   DNSBackend *db;
 
-  if (!::arg().mustDo("allow-unsigned-supermaster") && tsigkeyname.empty()) {
+  if (!::arg().mustDo("allow-unsigned-autoprimary") && tsigkeyname.empty()) {
     g_log<<Logger::Error<<"Received unsigned NOTIFY for "<<p.qdomain<<" from potential supermaster "<<remote<<". Refusing."<<endl;
     return RCode::Refused;
   }

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 268713d543946ed2e02e49e010753cf4f905fac5..dcc8051a24641c8a472835c57cba28bffbb3a7d7 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -431,12 +431,14 @@ int main(int argc, char **argv)
     if (::arg().mustDo("slave")) ::arg().set("secondary")="yes";
     if (::arg().mustDo("slave-renotify")) ::arg().set("secondary-do-renotify")="yes";
     if (::arg().mustDo("superslave")) ::arg().set("autosecondary")="yes";
+    if (::arg().mustDo("allow-unsigned-supermaster")) ::arg().set("allow-unsigned-autoprimary")="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-do-renotify")) ::arg().set("slave-renotify")="yes";
     if (::arg().mustDo("autosecondary")) ::arg().set("superslave")="yes";
+    if (::arg().mustDo("allow-unsigned-autoprimary")) ::arg().set("allow-unsigned-supermaster")="yes";
 
     g_log.setLoglevel((Logger::Urgency)(::arg().asNum("loglevel")));
     g_log.disableSyslog(::arg().mustDo("disable-syslog"));