mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

Check if catz is active in dns__catz_timer_cb()

Browse Source 
A reconfiguration can deactivate the catalog zone, while the
update process was deferred using a timer.
This commit is contained in:
Aram Sargsyan
2023-03-02 13:19:53 +00:00
parent 3973724d67
commit 67c77aba38
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/dns/catz.c
View File

@@ -2096,6 +2096,7 @@ dns__catz_timer_cb(void *arg) {
LOCK(&catz->catzs->lock); LOCK(&catz->catzs->lock);
INSIST(DNS_DB_VALID(catz->db)); INSIST(DNS_DB_VALID(catz->db));
INSIST(catz->dbversion != NULL);
INSIST(catz->updb == NULL); INSIST(catz->updb == NULL);
INSIST(catz->updbversion == NULL); INSIST(catz->updbversion == NULL);
@@ -2103,12 +2104,22 @@ dns__catz_timer_cb(void *arg) {
catz->updaterunning = true; catz->updaterunning = true;
catz->updateresult = ISC_R_UNSET; catz->updateresult = ISC_R_UNSET;
dns_name_format(&catz->name, domain, DNS_NAME_FORMATSIZE);
if (!catz->active) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
DNS_LOGMODULE_MASTER, ISC_LOG_INFO,
"catz: %s: no longer active, reload is canceled",
domain);
catz->updaterunning = false;
catz->updateresult = ISC_R_CANCELED;
goto exit;
}
dns_db_attach(catz->db, &catz->updb); dns_db_attach(catz->db, &catz->updb);
INSIST(catz->dbversion != NULL);
catz->updbversion = catz->dbversion; catz->updbversion = catz->dbversion;
catz->dbversion = NULL; catz->dbversion = NULL;
dns_name_format(&catz->name, domain, DNS_NAME_FORMATSIZE);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER, isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER,
ISC_LOG_INFO, "catz: %s: reload start", domain); ISC_LOG_INFO, "catz: %s: reload start", domain);
@@ -2116,6 +2127,7 @@ dns__catz_timer_cb(void *arg) {
isc_work_enqueue(catz->loop, dns__catz_update_cb, dns__catz_done_cb, isc_work_enqueue(catz->loop, dns__catz_update_cb, dns__catz_done_cb,
catz); catz);
exit:
isc_timer_destroy(&catz->updatetimer); isc_timer_destroy(&catz->updatetimer);
catz->loop = NULL; catz->loop = NULL;