From: Vitkor Velchev <ngshosting@gmail.com>
Date: Thu, 20 Oct 2016 13:01:11 +0000 (-0400)
Subject: Add support for "NONE" SOA-EDIT kind
X-Git-Tag: dnsdist-1.3.3~65^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d605927b597b8d09752069c6b8ed34b787dadc2b;p=thirdparty%2Fpdns.git

Add support for "NONE" SOA-EDIT kind

Setting the "SOA-EDIT" value for a zone to "NONE" causes an error:
'SOA-EDIT type 'NONE' for zone ZONENAME is unknown.'
---

diff --git a/pdns/serialtweaker.cc b/pdns/serialtweaker.cc
index fc2c075fff..7b1d7c7b9f 100644
--- a/pdns/serialtweaker.cc
+++ b/pdns/serialtweaker.cc
@@ -65,7 +65,11 @@ uint32_t calculateEditSOA(uint32_t old_serial, const string& kind, const DNSName
     uint32_t inception = getStartOfWeek();
     if (old_serial < inception)
       return inception;
-  } else if(!kind.empty()) {
+  }
+  else if(pdns_iequals(kind,"NONE")) {
+    // do nothing to serial. needed because a metadata of "" will use the default-soa-edit setting instead.
+  }
+  else if(!kind.empty()) {
     g_log<<Logger::Warning<<"SOA-EDIT type '"<<kind<<"' for zone "<<zonename<<" is unknown."<<endl;
   }
   return old_serial;