2366. [bug] Adb shutdown race. [RT #18021]

diff --git a/CHANGES b/CHANGES
index 2b63e74d8f4498ea33c89fcc0ce6e56aad8b28df..4304c53e54a621f3c9fa165039265edbed450bf1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2366.  [bug]           Adb shutdown race. [RT #18021]
+
 2365.   [bug]           Fix a bug that caused dns_acl_isany() to return
                         spurious results. [RT #18000]
 

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index e4b117ff28bfb9ff375abccb42b6bc91fc76e016..0f9390d0e28847545d47752edb5b71d407e5fbba 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.233.36.6 2008/05/01 18:32:31 jinmei Exp $ */
+/* $Id: adb.c,v 1.233.36.7 2008/05/02 04:42:32 marka Exp $ */
 
 /*! \file
  *
@@ -1234,7 +1234,7 @@ dec_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, isc_boolean_t lock) {
 
        free_adbentry(adb, &entry);
        if (result)
-               result =dec_adb_irefcnt(adb);
+               result = dec_adb_irefcnt(adb);
 
        return (result);
 }
@@ -1772,6 +1772,8 @@ shutdown_task(isc_task_t *task, isc_event_t *ev) {
        INSIST(DNS_ADB_VALID(adb));
 
        isc_event_free(&ev);
+       LOCK(&adb->lock);
+       UNLOCK(&adb->lock);
        destroy(adb);
 }