Expire names in shutdown_names() under the lock

Since there could be fetches running, we need to run expire_name() under
the lock when shutting down the names.

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 6f6b2ac78d2f25e453d86ef64f2bf1fa84ab9df7..e656c121cc08dbce85f5db67438f2052c803c70c 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -766,6 +766,8 @@ shutdown_names(dns_adb_t *adb) {
             name = next)
        {
                next = ISC_LIST_NEXT(name, link);
+               dns_adbname_ref(name);
+               LOCK(&name->lock);
                /*
                 * Run through the list.  For each name, clean up finds
                 * found there, and cancel any fetches running.  When
@@ -773,6 +775,8 @@ shutdown_names(dns_adb_t *adb) {
                 * itself.
                 */
                expire_name(name, DNS_EVENT_ADBSHUTDOWN, INT_MAX);
+               UNLOCK(&name->lock);
+               dns_adbname_detach(&name);
        }
        UNLOCK(&adb->names_lock);
 }