From 14d4bbea612e4021411225b39e7ed69856492fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Thu, 27 Feb 2020 08:45:10 +0100
Subject: [PATCH] Adjust lock/unlock in zone_rekey()

(cherry picked from commit aaaa7e67fa2b0ec618ec4be1af175fd6d73b76a0)
---
 lib/dns/zone.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 163ab4e33c..54b2ad967c 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -18341,10 +18341,11 @@ zone_rekey(dns_zone_t *zone) {
 
 	dns_db_closeversion(db, &ver, true);
 
+	LOCK_ZONE(zone);
+
 	if (commit) {
 		dns_difftuple_t *tuple;
 
-		LOCK_ZONE(zone);
 		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDNOTIFY);
 
 		zone_needdump(zone, DNS_DUMP_DELAY);
@@ -18462,10 +18463,8 @@ zone_rekey(dns_zone_t *zone) {
 		 * Schedule the next resigning event
 		 */
 		set_resigntime(zone);
-		UNLOCK_ZONE(zone);
 	}
 
-	LOCK_ZONE(zone);
 	isc_time_settoepoch(&zone->refreshkeytime);
 
 	/*