mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

3386. [bug] Address locking violation when generating new NSEC /

Browse Source 
NSEC3 chains. [RT #31224]
This commit is contained in:
Mark Andrews 2012-10-03 09:02:28 +10:00
parent 25644fbb2d
commit 9e70b51d3b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
3386. [bug] Address locking violation when generating new NSEC /
NSEC3 chains. [RT #31224]
3385. [bug] named-checkconf didn't detect missing master lists 3385. [bug] named-checkconf didn't detect missing master lists
in also-notify clauses. [RT #30810] in also-notify clauses. [RT #30810]

7
lib/dns/zone.c
View File

@ -6561,6 +6561,7 @@ zone_nsec3chain(dns_zone_t *zone) {
result = dns_dbiterator_next(nsec3chain->dbiterator); result = dns_dbiterator_next(nsec3chain->dbiterator);
if (result == ISC_R_NOMORE && nsec3chain->delete_nsec) { if (result == ISC_R_NOMORE && nsec3chain->delete_nsec) {
dns_dbiterator_pause(nsec3chain->dbiterator);
CHECK(fixup_nsec3param(db, version, nsec3chain, CHECK(fixup_nsec3param(db, version, nsec3chain,
ISC_FALSE, privatetype, ISC_FALSE, privatetype,
&param_diff)); &param_diff));
@ -6871,6 +6872,8 @@ zone_nsec3chain(dns_zone_t *zone) {
} }
} }
if (rebuild_nsec3) { if (rebuild_nsec3) {
if (nsec3chain != NULL)
dns_dbiterator_pause(nsec3chain->dbiterator);
result = dns_nsec3_addnsec3s(db, version, result = dns_nsec3_addnsec3s(db, version,
dns_db_origin(db), dns_db_origin(db),
zone->minimum, ISC_FALSE, zone->minimum, ISC_FALSE,
@ -6888,6 +6891,8 @@ zone_nsec3chain(dns_zone_t *zone) {
/* /*
* Add / update signatures for the NSEC3 records. * Add / update signatures for the NSEC3 records.
*/ */
if (nsec3chain != NULL)
dns_dbiterator_pause(nsec3chain->dbiterator);
result = update_sigs(&nsec3_diff, db, version, zone_keys, result = update_sigs(&nsec3_diff, db, version, zone_keys,
nkeys, zone, inception, expire, now, nkeys, zone, inception, expire, now,
check_ksk, keyset_kskonly, &sig_diff); check_ksk, keyset_kskonly, &sig_diff);
@ -6911,8 +6916,6 @@ zone_nsec3chain(dns_zone_t *zone) {
} }
if (updatensec) { if (updatensec) {
if (nsec3chain != NULL)
dns_dbiterator_pause(nsec3chain->dbiterator);
result = updatesecure(db, version, &zone->origin, result = updatesecure(db, version, &zone->origin,
zone->minimum, ISC_FALSE, &nsec_diff); zone->minimum, ISC_FALSE, &nsec_diff);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {