Release unused key file IO lock objects

Due to off-by-one error in zonemgr_keymgmt_delete, unused key file IO
lock objects were never freed and they were kept until the server
shutdown.  Adjust the returned value by -1 to accomodate the fact that
the atomic_fetch_*() functions return the value before the operation and
not current value after the operation.

(cherry picked from commit fb1acd6736609360f79a498d44dffcceb8ca0f54)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2456cd23bef2eef4cc6ef5377348369cdd9c3f48..22ffc73b63f4584e77d6ce763a911e08739cef17 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -18656,7 +18656,7 @@ zonemgr_keymgmt_delete(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
                if (dns_name_equal(kfio->name, &zone->origin)) {
                        unsigned int count;
 
-                       count = atomic_fetch_sub_relaxed(&kfio->count, 1);
+                       count = atomic_fetch_sub_relaxed(&kfio->count, 1) - 1;
                        if (count > 0) {
                                /* Keep the entry. */
                                break;