Merge pull request #6004 from pieterlexis/rm-old-soa-edit

Remove deprecated SOA-EDIT values

diff --git a/docs/dnssec/operational.rst b/docs/dnssec/operational.rst
index 100e284c088d7b35adf69ba70f647ec10ab3c2bb..a0687bcfc6461ac18aa90826e8373b16b70573b5 100644 (file)
--- a/docs/dnssec/operational.rst
+++ b/docs/dnssec/operational.rst
@@ -150,6 +150,9 @@ January 2016.
 INCEPTION (not recommended)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+.. deprecated:: 4.1.0
+  Removed in this release
+
 Sets the SOA serial to the last inception time in YYYYMMDD01 format.
 Uses localtime to find the day for inception time.
 
@@ -158,19 +161,18 @@ Uses localtime to find the day for inception time.
   changes to the zone will get visible on slaves only on the following
   inception day.
 
-.. deprecated:: 4.1.0
-
 INCEPTION-WEEK (not recommended)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+.. deprecated:: 4.1.0
+  Removed in this release
+
 Sets the SOA serial to the number of weeks since the epoch, which is the
 last inception time in weeks.
 
 .. warning::
   Same problem as INCEPTION.
 
-.. deprecated:: 4.1.0
-
 EPOCH
 ^^^^^
 

diff --git a/pdns/serialtweaker.cc b/pdns/serialtweaker.cc
index f55b5b6880659986bc3dde555c2c035707ace937..fa7a0fd69f3cdedf0d2de08f42460993a85bfa52 100644 (file)
--- a/pdns/serialtweaker.cc
+++ b/pdns/serialtweaker.cc
@@ -63,12 +63,7 @@ bool editSOARecord(DNSZoneRecord& rr, const string& kind) {
 uint32_t calculateEditSOA(const DNSZoneRecord& rr, const string& kind)
 {
   auto src = getRR<SOARecordContent>(rr.dr);
-  if(pdns_iequals(kind,"INCEPTION")) {
-    L<<Logger::Warning<<"Deprecation warning: The 'INCEPTION' soa-edit value will be removed in PowerDNS 4.1"<<endl;
-    time_t inception = getStartOfWeek();
-    return localtime_format_YYYYMMDDSS(inception, 1);
-  }
-  else if(pdns_iequals(kind,"INCEPTION-INCREMENT")) {
+  if(pdns_iequals(kind,"INCEPTION-INCREMENT")) {
     time_t inception = getStartOfWeek();
     uint32_t inception_serial = localtime_format_YYYYMMDDSS(inception, 1);
     uint32_t dont_increment_after = localtime_format_YYYYMMDDSS(inception + 2*86400, 99);
@@ -79,17 +74,11 @@ uint32_t calculateEditSOA(const DNSZoneRecord& rr, const string& kind)
       return (src->d_st.serial + 2); /* "<inceptionday>00" and "<inceptionday>01" are reserved for inception increasing, so increment sd.serial by two */
     }
   }
-  else if(pdns_iequals(kind,"INCEPTION-WEEK")) {
-    L<<Logger::Warning<<"Deprecation warning: The 'INCEPTION-WEEK' soa-edit value will be removed in PowerDNS 4.1"<<endl;
-    time_t inception = getStartOfWeek();
-    return ( inception / (7*86400) );
-  }
   else if(pdns_iequals(kind,"INCREMENT-WEEKS")) {
     time_t inception = getStartOfWeek();
     return (src->d_st.serial + (inception / (7*86400)));
   }
   else if(pdns_iequals(kind,"EPOCH")) {
-    L<<Logger::Warning<<"Deprecation warning: The 'EPOCH' soa-edit value will be removed in PowerDNS 4.1"<<endl;
     return time(0);
   }
   else if(pdns_iequals(kind,"INCEPTION-EPOCH")) {