Add deprecation warnings for #3210

diff --git a/docs/markdown/authoritative/dnssec.md b/docs/markdown/authoritative/dnssec.md
index cc4c3f7c938f39a3eb9052cc7f0f3fbfedbc869d..fa1e2d16704ff6379e3197edee8e314909b4e7f8 100644 (file)
--- a/docs/markdown/authoritative/dnssec.md
+++ b/docs/markdown/authoritative/dnssec.md
@@ -517,12 +517,16 @@ to find the day for inception time.
 **Warning**: The SOA serial will only change on inception day, so changes to the
 zone will get visible on slaves only on the following inception day.
 
+**Note**: Will be removed in PowerDNS Authoritative Server 4.1.0
+
 #### INCEPTION-WEEK (not recommended)
 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.
 
+**Note**: Will be removed in PowerDNS Authoritative Server 4.1.0
+
 #### EPOCH
 Sets the SOA serial to the number of seconds since the epoch.
 
@@ -530,6 +534,8 @@ Sets the SOA serial to the number of seconds since the epoch.
 the time. If you need fast updates, sync the backend databases directly with
 incremental updates (or use the same database server on the slaves)
 
+**Note**: Will be removed in PowerDNS Authoritative Server 4.1.0
+
 #### NONE
 Ignore [`default-soa-edit`](settings.md#default-soa-edit) and/or
 [`default-soa-edit-signed`](settings.md#default-soa-edit-signed) setings.

diff --git a/docs/markdown/changelog.raw.md b/docs/markdown/changelog.raw.md
index f3e1639e51c34a16bd8a78092654711c00b4e7ab..ffd8117bc82c3e94dc533227217e0a13461068fe 100644 (file)
--- a/docs/markdown/changelog.raw.md
+++ b/docs/markdown/changelog.raw.md
@@ -119,6 +119,7 @@ Important changes:
     - `insert-record-order-query` has been dropped, `insert-record-query` now sets the ordername (or NULL)
     - `insert-slave-query` has been dropped, `insert-zone-query` now sets the type of zone
 - Crypto++ and mbedTLS support is dropped, these are replaced by OpenSSL
+- The INCEPTION, INCEPTION-WEEK and EPOCH SOA-EDIT metadata values are marked as deprecated and will be removed in 4.1
 
 There are several **known issues** that will be fixed before the final 4.0.0 release:
 

diff --git a/pdns/serialtweaker.cc b/pdns/serialtweaker.cc
index 3dd474ef457ae38ed0cc73d9d150cd9a6752913a..850071315c4f40f264c6d0a8e92161d831ab0211 100644 (file)
--- a/pdns/serialtweaker.cc
+++ b/pdns/serialtweaker.cc
@@ -66,6 +66,7 @@ bool editSOARecord(DNSResourceRecord& rr, const string& kind, const DNSName& qna
 
 uint32_t calculateEditSOA(SOAData sd, const string& kind) {
   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);
   }
@@ -81,6 +82,7 @@ uint32_t calculateEditSOA(SOAData sd, const string& kind) {
     }
   }
   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) );
   }
@@ -89,6 +91,7 @@ uint32_t calculateEditSOA(SOAData sd, const string& kind) {
     return (sd.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")) {