From: Ruben d'Arco <cyclops@prof-x.net>
Date: Thu, 9 May 2013 19:44:44 +0000 (+0200)
Subject: Correct odername/auth when increasing serial
X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1c3e5a4916d25d0328aa5981d2f702f3705255f;p=thirdparty%2Fpdns.git

Correct odername/auth when increasing serial
---

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index ff3e7c7711..7087c40964 100755
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -856,11 +856,13 @@ void PacketHandler::increaseSerial(const string &msgPrefix, const DomainInfo *di
   L<<Logger::Notice<<msgPrefix<<"Increasing SOA serial ("<<oldSerial<<" -> "<<soa2Update.serial<<")"<<endl;
 
   //Correct ordername + auth flag
-  if(haveNSEC3) {
+  if (haveNSEC3 && narrow)
+    di->backend->nullifyDNSSECOrderNameAndUpdateAuth(di->id, newRec.qname, true);
+  else if (haveNSEC3) {
     string hashed;
-    if(!narrow) 
-      hashed=toLower(toBase32Hex(hashQNameWithSalt(ns3pr->d_iterations, ns3pr->d_salt, newRec.qname)));
-        
+    if (!narrow)
+      hashed = toLower(toBase32Hex(hashQNameWithSalt(ns3pr->d_iterations, ns3pr->d_salt, newRec.qname)));
+
     di->backend->updateDNSSECOrderAndAuthAbsolute(di->id, newRec.qname, hashed, true);
   }
   else // NSEC