4744. [bug] Suppress trust-anchor-telementry queries if

                        validation is disabled. [RT #46131]

diff --git a/CHANGES b/CHANGES
index df1bc116b41e984162520768d07ccf412ff95458..ff3b6a1c1c5722f6117039c45e949b7da1693bcd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4744.  [bug]           Suppress trust-anchor-telementry queries if
+                       validation is disabled. [RT #46131]
+
 4743.  [func]          Exclude trust-anchor-telementry queries from
                        synth-from-dnssec processing. [RT #46123]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 18060deea61c6c664823c1a6818dd270cca97a13..f16a05eac219f06c4e0ad29c0fcc1eca7873540d 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6551,12 +6551,16 @@ tat_timer_tick(isc_task_t *task, isc_event_t *event) {
             view != NULL;
             view = ISC_LIST_NEXT(view, link))
        {
-               if (!view->trust_anchor_telemetry)
+               if (!view->trust_anchor_telemetry ||
+                   !view->enablevalidation)
+               {
                        continue;
+               }
 
                result = dns_view_getsecroots(view, &secroots);
-               if (result != ISC_R_SUCCESS)
+               if (result != ISC_R_SUCCESS) {
                        continue;
+               }
 
                arg.view = view;
                arg.task = task;