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 a6d8c99d06789c4c48dabf30f4549c9e6c8c1427..df34009ae991afe44c6dd363bb73a151791282d1 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -8921,7 +8921,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;
@@ -8930,12 +8934,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);