Commit e5565808 authored by Matthijs Mekking's avatar Matthijs Mekking 🏡 Committed by Matthijs Mekking
Browse files

Update CHANGES

parent 6ed14eff
Pipeline #10379 passed with stages
in 19 minutes and 18 seconds
5168. [bug] Do not crash on shutdown when RPZ fails to load. Also,
keep previous version of the database if RPZ fails to
load. [GL #813]
5167. [bug] nxdomain-redirect could sometimes lookup the wrong 5167. [bug] nxdomain-redirect could sometimes lookup the wrong
redirect name. [GL #892] redirect name. [GL #892]
   
......
...@@ -1783,8 +1783,9 @@ dns_zone_get_rpz_num(dns_zone_t *zone) { ...@@ -1783,8 +1783,9 @@ dns_zone_get_rpz_num(dns_zone_t *zone) {
void void
dns_zone_rpz_enable_db(dns_zone_t *zone, dns_db_t *db) { dns_zone_rpz_enable_db(dns_zone_t *zone, dns_db_t *db) {
isc_result_t result; isc_result_t result;
if (zone->rpz_num == DNS_RPZ_INVALID_NUM) if (zone->rpz_num == DNS_RPZ_INVALID_NUM) {
return; return;
}
REQUIRE(zone->rpzs != NULL); REQUIRE(zone->rpzs != NULL);
result = dns_db_updatenotify_register(db, result = dns_db_updatenotify_register(db,
dns_rpz_dbupdate_callback, dns_rpz_dbupdate_callback,
...@@ -1794,14 +1795,13 @@ dns_zone_rpz_enable_db(dns_zone_t *zone, dns_db_t *db) { ...@@ -1794,14 +1795,13 @@ dns_zone_rpz_enable_db(dns_zone_t *zone, dns_db_t *db) {
static void static void
dns_zone_rpz_disable_db(dns_zone_t *zone, dns_db_t *db) { dns_zone_rpz_disable_db(dns_zone_t *zone, dns_db_t *db) {
isc_result_t result; if (zone->rpz_num == DNS_RPZ_INVALID_NUM) {
if (zone->rpz_num == DNS_RPZ_INVALID_NUM)
return; return;
}
REQUIRE(zone->rpzs != NULL); REQUIRE(zone->rpzs != NULL);
result = dns_db_updatenotify_unregister(db, (void) dns_db_updatenotify_unregister(db,
dns_rpz_dbupdate_callback, dns_rpz_dbupdate_callback,
zone->rpzs->zones[zone->rpz_num]); zone->rpzs->zones[zone->rpz_num]);
REQUIRE(result == ISC_R_SUCCESS);
} }
void void
...@@ -1812,8 +1812,9 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) { ...@@ -1812,8 +1812,9 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) {
LOCK_ZONE(zone); LOCK_ZONE(zone);
INSIST(zone->catzs == NULL || zone->catzs == catzs); INSIST(zone->catzs == NULL || zone->catzs == catzs);
dns_catz_catzs_set_view(catzs, zone->view); dns_catz_catzs_set_view(catzs, zone->view);
if (zone->catzs == NULL) if (zone->catzs == NULL) {
dns_catz_catzs_attach(catzs, &zone->catzs); dns_catz_catzs_attach(catzs, &zone->catzs);
}
UNLOCK_ZONE(zone); UNLOCK_ZONE(zone);
} }
......
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