move TSIG and TKEY destroy routines to server.c

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");

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);