3372. [bug] Silence spurious "deleted from unreachable cache"

                        messages.  [RT #30501]

diff --git a/CHANGES b/CHANGES
index b95c679b0191b44da465574b7a0d62abaae7e852..f187f7db6de1d1907512a742fd43204a27480f9f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3372.  [bug]           Silence spurious "deleted from unreachable cache"
+                       messages.  [RT #30501]
+
 3371.  [bug]           AD=1 should behave like DO=1 when deciding whether to
                        add NS RRsets to the additional section or not.
                        [RT #30479]

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 4ac9e8efa6ea0c52bae803da774d27b45adfea1c..58110a6dac8131a8f400c9069b1823b693c48eda 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -14550,6 +14550,8 @@ dns_zonemgr_unreachabledel(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote,
        for (i = 0; i < UNREACH_CHACHE_SIZE; i++) {
                if (isc_sockaddr_equal(&zmgr->unreachable[i].remote, remote) &&
                    isc_sockaddr_equal(&zmgr->unreachable[i].local, local)) {
+                       if (zmgr->unreachable[i].expire == 0)
+                               break;
                        result = isc_rwlock_tryupgrade(&zmgr->urlock);
                        if (result == ISC_R_SUCCESS) {
                                locktype = isc_rwlocktype_write;