From f9d8c276c18ef52f7afd8089b93ac773eb0595ab Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Fri, 5 Nov 1999 20:20:18 +0000
Subject: [PATCH] move TSIG and TKEY destroy routines to server.c

---
 bin/named/main.c   | 2 --
 bin/named/server.c | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/named/main.c b/bin/named/main.c
index 9cfc386a7f..a95c97e3de 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -280,8 +280,6 @@ setup() {
 static void
 cleanup() {
 	destroy_managers();
-	dns_tsig_destroy();
-	dns_tkey_destroy();
 	isc_rwlock_destroy(&ns_g_viewlock);
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 		      ISC_LOG_NOTICE, "exiting");
diff --git a/bin/named/server.c b/bin/named/server.c
index 0ccf709e5b..6da4e564f3 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -536,6 +536,9 @@ shutdown_server(isc_task_t *task, isc_event_t *event) {
 	 */
 	dns_c_ctx_delete(ns_g_lctx, &ns_g_confctx);
 
+	dns_tkey_destroy();
+	dns_tsig_destroy();
+
 	RWUNLOCK(&ns_g_viewlock, isc_rwlocktype_write);
 
 	isc_task_detach(&server_task);