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.

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 8c73379834f3325b17172f7108254f021ad1ae67..eac0fe18be39e03a28e307046cb091f3f5f0b852 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 014f7b9575b9aee8663040f0849a1a95d9bbf8c3..0cbd462b1de49e3b089fb5a6e2f667ada3dd10a0 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3473,7 +3473,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 2bed9223104c115b218d38c4489e02b476578dd3..2365a6cc0aeaecace866b2347a6b8801d1d050cc 100644 (file)
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -59,7 +59,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;
 }