named: remove named_g_defaultdnstap global variable

The named_g_defaultdnstap was never used as the dnstap requires
explicit configuration of the output file.

Related scan-build report:

./server.c:3476:14: warning: Value stored to 'dpath' during its initialization is never read
        const char *dpath = named_g_defaultdnstap;
                    ^~~~~   ~~~~~~~~~~~~~~~~~~~~~
1 warning generated.

(cherry picked from commit 6decd145926387347216f5a9ecbf8ca4593d11be)

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 49e75a15230dcfd1926316a8ff2d94eaf0eecf14..aa85453c9861e2f17d012190c9d33840f551dee9 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -135,14 +135,6 @@ EXTERN const char *                named_g_defaultpidfile  INIT(NAMED_LOCALSTATEDIR
                                                             "/run/named.pid");
 #endif
 
-#ifdef HAVE_DNSTAP
-EXTERN const char *            named_g_defaultdnstap
-                                       INIT(NAMED_LOCALSTATEDIR "/run/named/"
-                                                             "dnstap.sock");
-#else
-EXTERN const char *            named_g_defaultdnstap   INIT(NULL);
-#endif /* HAVE_DNSTAP */
-
 EXTERN const char *            named_g_username        INIT(NULL);
 
 EXTERN const char *            named_g_engine          INIT(NULL);

diff --git a/bin/named/server.c b/bin/named/server.c
index 5c72e36e9cebfa35c4d4dd879d9dc56c485a2ee1..86d4eb82508351edfe66ba6dc0e8c0aa2f1d004f 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3485,7 +3485,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) {
        isc_result_t result;
        const cfg_obj_t *obj, *obj2;
        const cfg_listelt_t *element;
-       const char *dpath = named_g_defaultdnstap;
+       const char *dpath;
        const cfg_obj_t *dlist = NULL;
        dns_dtmsgtype_t dttypes = 0;
        unsigned int i;

diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index c1fe90410c848a91457fedf4f5788a848c65d102..cb25ba0359543e850ea47f2933308745f2a2d7d2 100644 (file)
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -60,7 +60,6 @@ named_paths_init(void) {
        named_g_keyfile = isc_ntpaths_get(RNDC_KEY_PATH);
        named_g_defaultsessionkeyfile = isc_ntpaths_get(SESSION_KEY_PATH);
        named_g_defaultbindkeys = isc_ntpaths_get(BIND_KEYS_PATH);
-       named_g_defaultdnstap = NULL;
 
        Initialized = TRUE;
 }