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.

diff --git a/doc/misc/options b/doc/misc/options
index 6a193547a0685e1406f63aa3dffd659c6332cff2..c5a5193183cd854fbe1971b5590a7cd1f3f50bdf 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -302,7 +302,6 @@ options {
        tcp-primaries-timeout <integer>;
        tcp-receive-buffer <integer>;
        tcp-send-buffer <integer>;
-       tkey-domain <quoted_string>; // obsolete
        tkey-gssapi-keytab <quoted_string>;
        tls-port <integer>;
        transfer-format ( many-answers | one-answer );

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index cb4a36c2b6a2c4d342bf20efba1f300bb5d01bcb..f6df82d9952aee31a022f52ced8bfffbcc755b24 100644 (file)
--- 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 },