From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 10 May 2016 10:28:18 +0000 (+0200)
Subject: Add deprecation warnings for #3210
X-Git-Tag: auth-4.0.0-alpha3~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3815%2Fhead;p=thirdparty%2Fpdns.git

Add deprecation warnings for #3210
---

diff --git a/docs/markdown/authoritative/dnssec.md b/docs/markdown/authoritative/dnssec.md
index cc4c3f7c93..fa1e2d1670 100644
--- 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 f3e1639e51..ffd8117bc8 100644
--- 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 3dd474ef45..850071315c 100644
--- 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")) {