upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-26 12:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '542-prevent-a-race-after-zone-load' into 'master'

Browse source 
Prevent a race after zone load

Closes #542

See merge request isc-projects/bind9!795
This commit is contained in:
Evan Hunt 2018-09-26 22:45:11 -04:00
commit 37e834defc
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5034. [bug] A race between threads could prevent zone maintenance
scheduled immediately after zone load from being
performed. [GL #542]
5033. [bug] When adding NTAs to multiple views using "rndc nta",
the text returned via rndc was incorrectly terminated
after the first line, making it look as if only one

9
lib/dns/zone.c
View file

@ -10006,7 +10006,7 @@ zone_maintenance(dns_zone_t *zone) {
const char me[] = "zone_maintenance";
isc_time_t now;
isc_result_t result;
bool dumping;
bool dumping, load_pending;
REQUIRE(DNS_ZONE_VALID(zone));
ENTER;
@ -10014,8 +10014,13 @@ zone_maintenance(dns_zone_t *zone) {
/*
* Are we pending load/reload?
*/
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING))
LOCK_ZONE(zone);
load_pending = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING);
UNLOCK_ZONE(zone);
if (load_pending) {
return;
}
/*
* Configuring the view of this zone may have