From c5c2a4820b6dd705443e42a515cd20fc4293d35b Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 17 Sep 2020 15:18:27 +1000
Subject: [PATCH] Cleanup connection before detaching

---
 bin/named/controlconf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index db755314e9..5d776e638e 100644
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -383,8 +383,8 @@ control_command(isc_task_t *task, isc_event_t *event) {
 	UNUSED(task);
 
 	if (listener->controls->shuttingdown) {
-		isc_nmhandle_detach(&conn->cmdhandle);
 		conn_cleanup(conn);
+		isc_nmhandle_detach(&conn->cmdhandle);
 		goto done;
 	}