From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Mon, 4 Aug 2014 13:52:07 +0000 (+0200)
Subject: Remove unused "soa-serial-offset" option
X-Git-Tag: auth-3.4.0-rc2~51^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1fe72a495de9078c07cbeb01fd3e9fdaf39c1a9;p=thirdparty%2Fpdns.git

Remove unused "soa-serial-offset" option
---

diff --git a/modules/luabackend/test/pdns.conf b/modules/luabackend/test/pdns.conf
index 08b80df758..3adb55d543 100644
--- a/modules/luabackend/test/pdns.conf
+++ b/modules/luabackend/test/pdns.conf
@@ -264,11 +264,6 @@ local-ipv6=::1
 #
 # soa-retry-default=3600
 
-#################################
-# soa-serial-offset	Make sure that no SOA serial is less than this number
-#
-# soa-serial-offset=0
-
 #################################
 # socket-dir	Where the controlsocket will live
 #
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index e5969f3481..550244387e 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -57,8 +57,7 @@ void declareArguments()
   ::arg().set("query-local-address6","Source IPv6 address for sending queries")="::";
   ::arg().set("overload-queue-length","Maximum queuelength moving to packetcache only")="0";
   ::arg().set("max-queue-length","Maximum queuelength before considering situation lost")="5000";
-  ::arg().set("soa-serial-offset","Make sure that no SOA serial is less than this number")="0";
-  
+
   ::arg().set("retrieval-threads", "Number of AXFR-retrieval threads for slave operation")="2";
   ::arg().setSwitch("experimental-json-interface", "If the webserver should serve JSON data")="no";
   ::arg().setSwitch("experimental-api-readonly", "If the JSON API should disallow data modification")="no";
diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index baa8f2a552..765b250c43 100644
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -332,7 +332,7 @@ bool DNSBackend::calculateSOASerial(const string& domain, const SOAData& sd, tim
         newest=i.last_modified;
     }
 
-    serial=newest; // +arg().asNum("soa-serial-offset");
+    serial=newest;
 
     return true;
 }
diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index 9efa7cb653..6ce5fbdcbe 100644
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -13463,6 +13463,16 @@ UPDATE records SET auth=1 WHERE auth IS NULL;
               </para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term>soa-serial-offset=...</term>
+            <listitem>
+              <para>
+                If your database contains single-digit SOA serials and you need to host .DE domains, this setting can help
+                placate their 6-digit SOA serial requirements. Suggested value is to set this to 1000000 which adds 1000000 to all SOA Serials
+                under that offset.
+              </para>
+            </listitem>
+          </varlistentry>
         </variablelist>
       </sect3>
       <sect3><title>Options with changed default values</title>
@@ -17427,12 +17437,6 @@ This setting will make PowerDNS renotify the slaves after an AXFR is *received*
 	    <listitem><para>
 	      Default <link linkend="soa-type">SOA</link> retry.
 	      </para></listitem></varlistentry>
-	  <varlistentry><term>soa-serial-offset=...</term>
-	    <listitem><para>
-	      If your database contains single-digit SOA serials and you need to host .DE domains, this setting can help
-	      placate their 6-digit SOA serial requirements. Suggested value is to set this to 1000000 which adds 1000000 to all SOA Serials
-	      under that offset.
-	      </para></listitem></varlistentry>
 	  <varlistentry><term>socket-dir=...</term>
 	    <listitem><para>
 		Where the controlsocket will live. See <xref linkend="controlsocket"/>.
diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 510341ee8b..ec203c0d16 100644
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -429,11 +429,6 @@
 #
 # soa-retry-default=3600
 
-#################################
-# soa-serial-offset	Make sure that no SOA serial is less than this number
-#
-# soa-serial-offset=0
-
 #################################
 # socket-dir	Where the controlsocket will live
 #
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index eabe3c708c..efd61762e7 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2079,7 +2079,6 @@ int main(int argc, char **argv)
   try {
     ::arg().set("stack-size","stack size per mthread")="200000";
     ::arg().set("soa-minimum-ttl","Don't change")="0";
-    ::arg().set("soa-serial-offset","Don't change")="0";
     ::arg().set("no-shuffle","Don't change")="off";
     ::arg().set("local-port","port to listen on")="53";
     ::arg().set("local-address","IP addresses to listen on, separated by spaces or commas. Also accepts ports.")="127.0.0.1";