adjust goto target and conditional compilation so that cleanup_spillattimer and clean...

(cherry picked from commit 7b27be54ee9a97ef8caadb08ac6dec0966bdffcb)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 145dd664180bea52deaac6d8738e6c1a05eb1470..f58aee539858c2d22d8c7af70bce72a781efea1b 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -9016,7 +9016,11 @@ dns_resolver_create(dns_view_t *view,
 #if USE_MBSLOCK
        result = isc_rwlock_init(&res->mbslock, 0, 0);
        if (result != ISC_R_SUCCESS)
+#if USE_ALGLOCK
                goto cleanup_alglock;
+#else
+               goto cleanup_spillattimer;
+#endif
 #endif
 
        res->magic = RES_MAGIC;
@@ -9025,12 +9029,11 @@ dns_resolver_create(dns_view_t *view,
 
        return (ISC_R_SUCCESS);
 
-#if USE_MBSLOCK
+#if USE_ALGLOCK && USE_MBSLOCK
  cleanup_alglock:
-#if USE_ALGLOCK
        isc_rwlock_destroy(&res->alglock);
 #endif
-#endif
+
 #if USE_ALGLOCK || USE_MBSLOCK
  cleanup_spillattimer:
        isc_timer_detach(&res->spillattimer);