Commit b4750b59 authored by Mark Andrews's avatar Mark Andrews
Browse files

reset zversion on restart

parent c2afbab9
...@@ -3302,6 +3302,7 @@ query_addbestns(ns_client_t *client) { ...@@ -3302,6 +3302,7 @@ query_addbestns(ns_client_t *client) {
if (sigrdataset != NULL) if (sigrdataset != NULL)
query_putrdataset(client, &sigrdataset); query_putrdataset(client, &sigrdataset);
RESTORE(db, zdb);
RESTORE(fname, zfname); RESTORE(fname, zfname);
RESTORE(rdataset, zrdataset); RESTORE(rdataset, zrdataset);
RESTORE(sigrdataset, zsigrdataset); RESTORE(sigrdataset, zsigrdataset);
...@@ -6821,6 +6822,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -6821,6 +6822,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
want_restart = ISC_FALSE; want_restart = ISC_FALSE;
authoritative = ISC_FALSE; authoritative = ISC_FALSE;
version = NULL; version = NULL;
zversion = NULL;
need_wildcardproof = ISC_FALSE; need_wildcardproof = ISC_FALSE;
if (client->view->checknames && if (client->view->checknames &&
...@@ -7463,9 +7465,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -7463,9 +7465,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
dns_db_detachnode(db, &node); dns_db_detachnode(db, &node);
SAVE(zdb, db); SAVE(zdb, db);
SAVE(zfname, fname); SAVE(zfname, fname);
SAVE(zversion, version);
SAVE(zrdataset, rdataset); SAVE(zrdataset, rdataset);
SAVE(zsigrdataset, sigrdataset); SAVE(zsigrdataset, sigrdataset);
SAVE(zversion, version);
dns_db_attach(client->view->cachedb, &db); dns_db_attach(client->view->cachedb, &db);
is_zone = ISC_FALSE; is_zone = ISC_FALSE;
goto db_find; goto db_find;
...@@ -7504,9 +7506,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -7504,9 +7506,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
version = NULL; version = NULL;
RESTORE(fname, zfname); RESTORE(fname, zfname);
RESTORE(version, zversion);
RESTORE(rdataset, zrdataset); RESTORE(rdataset, zrdataset);
RESTORE(sigrdataset, zsigrdataset); RESTORE(sigrdataset, zsigrdataset);
RESTORE(version, zversion);
/* /*
* We don't clean up zdb here because we * We don't clean up zdb here because we
* may still need it. It will get cleaned * may still need it. It will get cleaned
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment