2752. [bug] Locking violation. [RT #20587]

diff --git a/CHANGES b/CHANGES
index 8ab0d22d8971798eb43223028372bdccd342487e..b6e1c5001fb3a119e1df475a06f239edd808260a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2752.  [bug]           Locking violation. [RT #20587]
+
 2751.  [bug]           Fixed a memory leak in dnssec-keyfromlabel. [RT #20588]
 
 2750.  [bug]           dig: assertion failure could occur when a server

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 3fe2477d429a186ac98f38a672c649ff16808ff6..4eaf8c12c6b2024097f4c74d016df78a85dfe581 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.525 2009/11/05 21:45:05 each Exp $ */
+/* $Id: zone.c,v 1.526 2009/11/06 01:30:06 marka Exp $ */
 
 /*! \file */
 
@@ -5937,9 +5937,11 @@ zone_nsec3chain(dns_zone_t *zone) {
                /*
                 * Add a NSEC record except at the origin.
                 */
-               if (!dns_name_equal(name, dns_db_origin(db)))
+               if (!dns_name_equal(name, dns_db_origin(db))) {
+                       dns_dbiterator_pause(nsec3chain->dbiterator);
                        CHECK(add_nsec(db, version, name, node, zone->minimum,
                                       delegation, &nsec_diff));
+               }
 
  next_removenode:
                first = ISC_FALSE;