From: Mark Andrews <marka@isc.org>
Date: Tue, 5 Nov 2024 23:23:22 +0000 (+1100)
Subject: Remove named_g_sessionkey and named_g_sessionkeyname
X-Git-Tag: v9.21.3~43^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=f70ff727ec28bf026a3b554ba1ee20be463f9153;p=thirdparty%2Fbind9.git

Remove named_g_sessionkey and named_g_sessionkeyname

They are only declared and cleaned up but otherwise unused.
---

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 9ada34a768f..a739df0ed8c 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -98,8 +98,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 35b3ac92533..9ec95d6da6b 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9730,10 +9730,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 */