From e2746e86d973d631a819ebbc1824a9af7d1e3571 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 6 Nov 2024 10:23:22 +1100 Subject: [PATCH] Remove named_g_sessionkey and named_g_sessionkeyname They are only declared and cleaned up but otherwise unused. (cherry picked from commit f70ff727ec28bf026a3b554ba1ee20be463f9153) --- bin/named/include/named/globals.h | 2 -- bin/named/server.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h index 0fc26f212d..25d03fff60 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h @@ -100,8 +100,6 @@ EXTERN const char *named_g_conffile INIT(NAMED_SYSCONFDIR "/named.conf"); EXTERN const char *named_g_defaultbindkeys INIT(NULL); EXTERN const char *named_g_keyfile INIT(NAMED_SYSCONFDIR "/rndc.key"); -EXTERN dns_tsigkey_t *named_g_sessionkey INIT(NULL); -EXTERN dns_name_t named_g_sessionkeyname; EXTERN bool named_g_conffileset INIT(false); EXTERN cfg_aclconfctx_t *named_g_aclconfctx INIT(NULL); diff --git a/bin/named/server.c b/bin/named/server.c index 3d05c120ac..bb9f6049fc 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -10207,10 +10207,6 @@ shutdown_server(void *arg) { dns_zonemgr_shutdown(server->zonemgr); - if (named_g_sessionkey != NULL) { - dns_tsigkey_detach(&named_g_sessionkey); - dns_name_free(&named_g_sessionkeyname, server->mctx); - } #if defined(HAVE_GEOIP2) named_geoip_shutdown(); #endif /* HAVE_GEOIP2 */