From: Mark Andrews <marka@isc.org>
Date: Fri, 3 Jun 2016 04:32:21 +0000 (+1000)
Subject: reset zversion on restart
X-Git-Tag: v9.11.0b1~75
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b4750b59910e1deb1329120f480bd5f8780e3eac;p=thirdparty%2Fbind9.git

reset zversion on restart
---

diff --git a/bin/named/query.c b/bin/named/query.c
index 20e99edc777..436322c1ad5 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -3302,6 +3302,7 @@ query_addbestns(ns_client_t *client) {
 		if (sigrdataset != NULL)
 			query_putrdataset(client, &sigrdataset);
 
+		RESTORE(db, zdb);
 		RESTORE(fname, zfname);
 		RESTORE(rdataset, zrdataset);
 		RESTORE(sigrdataset, zsigrdataset);
@@ -6821,6 +6822,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 	want_restart = ISC_FALSE;
 	authoritative = ISC_FALSE;
 	version = NULL;
+	zversion = NULL;
 	need_wildcardproof = ISC_FALSE;
 
 	if (client->view->checknames &&
@@ -7463,9 +7465,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 				dns_db_detachnode(db, &node);
 				SAVE(zdb, db);
 				SAVE(zfname, fname);
+				SAVE(zversion, version);
 				SAVE(zrdataset, rdataset);
 				SAVE(zsigrdataset, sigrdataset);
-				SAVE(zversion, version);
 				dns_db_attach(client->view->cachedb, &db);
 				is_zone = ISC_FALSE;
 				goto db_find;
@@ -7504,9 +7506,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 				version = NULL;
 
 				RESTORE(fname, zfname);
+				RESTORE(version, zversion);
 				RESTORE(rdataset, zrdataset);
 				RESTORE(sigrdataset, zsigrdataset);
-				RESTORE(version, zversion);
 				/*
 				 * We don't clean up zdb here because we
 				 * may still need it.  It will get cleaned