From 14b7e03bbb05fc02ec89f46c71755b06fb87b1b3 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 29 Oct 2012 15:36:44 +0000
Subject: [PATCH] Avoid metadata mixup in some slaving cases. Patch by Kees
 Monshouwer, closing #603

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2834 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/slavecommunicator.cc        | 8 ++++----
 regression-tests/start-test-stop | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 8dcce8dac..c12cc5a24 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -324,10 +324,6 @@ void CommunicatorClass::suck(const string &domain,const string &remote)
       }
     }
 
-    di.backend->commitTransaction();
-    di.backend->setFresh(domain_id);
-    PC.purge(domain+"$");
-
     // now we also need to update the presigned flag and NSEC3PARAM
     // for the zone
     if (gotPresigned) {
@@ -359,6 +355,10 @@ void CommunicatorClass::suck(const string &domain,const string &remote)
       dk.unsetNSEC3PARAM(domain);
     }
 
+    di.backend->commitTransaction();
+    di.backend->setFresh(domain_id);
+    PC.purge(domain+"$");
+
 
     L<<Logger::Error<<"AXFR done for '"<<domain<<"', zone committed with serial number "<<soa_serial<<endl;
     if(::arg().mustDo("slave-renotify"))
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index cbdddfa7e..11d21e147 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -541,11 +541,6 @@ then
 			--cache-ttl=0 --no-config --bind-dnssec-db=./dnssec-slave.sqlite3 &
 		echo 'waiting for zones to be loaded'
 		bindwait bind-slave
-		echo 'reloading zones to work around metadata bug'
-		for zone in $(grep zone named.conf  | cut -f2 -d\")
-		do
-			../pdns/pdns_control --no-config --socket-dir=. --config-name=bind-slave bind-reload-now $zone
-		done
 	fi
 fi
 
-- 
2.40.0