Deprecate the "tkey-domain" statement

Mark the "tkey-domain" statement as deprecated since it is only used by
code implementing TKEY Mode 2 (Diffie-Hellman), which was removed from
newer BIND 9 branches.

diff --git a/doc/misc/options b/doc/misc/options
index fb0bf6563a98521382974968dc2cd6ce17213053..53b569d714e90c43264bca4f2ae69bb9e5d5007b 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -299,7 +299,7 @@ options {
        tcp-receive-buffer <integer>;
        tcp-send-buffer <integer>;
        tkey-dhkey <quoted_string> <integer>; // deprecated
-       tkey-domain <quoted_string>;
+       tkey-domain <quoted_string>; // deprecated
        tkey-gssapi-credential <quoted_string>; // deprecated
        tkey-gssapi-keytab <quoted_string>;
        tls-port <integer>;

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index e2fc05677ca99be9de06ecedae5e401fef57e90e..29699611f60379f6eafd76ac04ede93200884c9f 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1339,7 +1339,7 @@ static cfg_clausedef_t options_clauses[] = {
        { "tcp-receive-buffer", &cfg_type_uint32, 0 },
        { "tcp-send-buffer", &cfg_type_uint32, 0 },
        { "tkey-dhkey", &cfg_type_tkey_dhkey, CFG_CLAUSEFLAG_DEPRECATED },
-       { "tkey-domain", &cfg_type_qstring, 0 },
+       { "tkey-domain", &cfg_type_qstring, CFG_CLAUSEFLAG_DEPRECATED },
        { "tkey-gssapi-credential", &cfg_type_qstring,
          CFG_CLAUSEFLAG_DEPRECATED },
        { "tkey-gssapi-keytab", &cfg_type_qstring, 0 },