Remove named_g_sessionkey and named_g_sessionkeyname

They are only declared and cleaned up but otherwise unused.

(cherry picked from commit f70ff727ec28bf026a3b554ba1ee20be463f9153)

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index c65e93343cd946ef2b5588c557cc15ee5bfa8c32..65fc27c4f18f146939c14eadf076046ed4d84e88 100644 (file)
--- 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(NAMED_SYSCONFDIR "/bind.keys");
 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 1d30bb8f8246abdb7663f3dd6b157ef4298721d6..8d7eb3517215d9d9be2ed08909dd2015c6726746 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10298,10 +10298,6 @@ shutdown_server(isc_task_t *task, isc_event_t *event) {
 
        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 */