From 5d8aa1673a9507f04bcb5fcca7db67836472460b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Mon, 6 Oct 2025 14:14:33 +0200 Subject: [PATCH] Remove "tkey-domain" Since the "tkey-domain" statement has been previously obsoleted, mark it as ancient to make any attempts to use it a fatal error. --- doc/misc/options | 1 - lib/isccfg/namedconf.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/misc/options b/doc/misc/options index 6a193547a0..c5a5193183 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -302,7 +302,6 @@ options { tcp-primaries-timeout ; tcp-receive-buffer ; tcp-send-buffer ; - tkey-domain ; // obsolete tkey-gssapi-keytab ; tls-port ; transfer-format ( many-answers | one-answer ); diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index cb4a36c2b6..f6df82d995 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1348,7 +1348,7 @@ static cfg_clausedef_t options_clauses[] = { { "tcp-receive-buffer", &cfg_type_uint32, 0 }, { "tcp-send-buffer", &cfg_type_uint32, 0 }, { "tkey-dhkey", NULL, CFG_CLAUSEFLAG_ANCIENT }, - { "tkey-domain", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE }, + { "tkey-domain", &cfg_type_qstring, CFG_CLAUSEFLAG_ANCIENT }, { "tkey-gssapi-credential", &cfg_type_qstring, CFG_CLAUSEFLAG_ANCIENT }, { "tkey-gssapi-keytab", &cfg_type_qstring, 0 }, { "transfer-message-size", &cfg_type_uint32, 0 },