From 8882d887314970d144fb7c7c02344e70a7c22202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 18 Dec 2023 15:11:39 +0100
Subject: [PATCH] "trust-anchor-telemetry" is no longer experimental

Remove the CFG_CLAUSEFLAG_EXPERIMENTAL flag from the
"trust-anchor-telemetry" statement as the behavior of the latter has not
been changed since its initial implementation and there are currently no
plans to do so.  This silences a relevant log message that was emitted
even when the feature was explicitly disabled.

(cherry picked from commit b1baf7af3a9c90d7d939d0214df0556f0fea7b6b)
---
 doc/misc/options       | 4 ++--
 lib/isccfg/namedconf.c | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/misc/options b/doc/misc/options
index a91670154c..da2847708f 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -305,7 +305,7 @@ options {
 	transfers-in <integer>;
 	transfers-out <integer>;
 	transfers-per-ns <integer>;
-	trust-anchor-telemetry <boolean>; // experimental
+	trust-anchor-telemetry <boolean>;
 	try-tcp-refresh <boolean>;
 	udp-receive-buffer <integer>;
 	udp-send-buffer <integer>;
@@ -582,7 +582,7 @@ view <string> [ <class> ] {
 	transfer-format ( many-answers | one-answer );
 	transfer-source ( <ipv4_address> | * ) ;
 	transfer-source-v6 ( <ipv6_address> | * ) ;
-	trust-anchor-telemetry <boolean>; // experimental
+	trust-anchor-telemetry <boolean>;
 	trust-anchors { <string> ( static-key | initial-key | static-ds | initial-ds ) <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times
 	trusted-keys { <string> <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
 	try-tcp-refresh <boolean>;
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 5a8ccb2c34..d5b28baad2 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2163,8 +2163,7 @@ static cfg_clausedef_t view_clauses[] = {
 	{ "synth-from-dnssec", &cfg_type_boolean, 0 },
 	{ "topology", NULL, CFG_CLAUSEFLAG_ANCIENT },
 	{ "transfer-format", &cfg_type_transferformat, 0 },
-	{ "trust-anchor-telemetry", &cfg_type_boolean,
-	  CFG_CLAUSEFLAG_EXPERIMENTAL },
+	{ "trust-anchor-telemetry", &cfg_type_boolean, 0 },
 	{ "use-queryport-pool", NULL, CFG_CLAUSEFLAG_ANCIENT },
 	{ "validate-except", &cfg_type_namelist, 0 },
 	{ "v6-bias", &cfg_type_uint32, 0 },