diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook index f86e418b74..672bc78b4e 100644 --- a/bin/named/named.conf.docbook +++ b/bin/named/named.conf.docbook @@ -156,7 +156,7 @@ logging { MANAGED-KEYS - See DNSSEC-KEYS. + Deprecated - see DNSSEC-KEYS. managed-keys { string ( static-key | initial-key ) integer integer integer @@ -652,7 +652,7 @@ view string [ class ] { lmdb-mapsize sizeval; managed-keys { string ( static-key | initial-key ) integer integer - integer quoted_string; ... }; + integer quoted_string; ... };, deprecated masterfile-format ( map | raw | text ); masterfile-style ( full | relative ); match-clients { address_match_element; ... }; diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook index 4ee0b7a80d..acc14ac2cd 100644 --- a/bin/rndc/rndc.docbook +++ b/bin/rndc/rndc.docbook @@ -772,9 +772,8 @@ Dump the security roots (i.e., trust anchors - configured via dnssec-keys statements, - or the synonymous managed-keys or - the deprecated trusted-keys statements, or + configured via dnssec-keys statements, or the + managed-keys or trusted-keys statements (both deprecated), or via dnssec-validation auto) and negative trust anchors for the specified views. If no view is specified, all views are dumped. Security roots will indicate whether diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index e300267c0c..cd75915bd0 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -2213,8 +2213,8 @@ allow-update { !{ !localnets; any; }; key host1-host2. ;}; if at least one trust anchor has been explicitly configured in named.conf using a dnssec-keys statement (or the - synonymous managed-keys or the deprecated - trusted-keys statements). + managed-keys and trusted-keys + statements, both deprecated). When dnssec-validation is set to @@ -3209,8 +3209,6 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa. keys are kept up to date using RFC 5011 trust anchor maintenance, and if used with static-key, keys are permanent. - Identical to managed-keys, - but has been added for improved clarity. @@ -3220,8 +3218,11 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa. - is identical to dnssec-keys, - and is retained for backward compatibility. + is identical to dnssec-keys; + this option is deprecated in favor + of dnssec-keys with + the initial-key keyword, + and may be removed in a future release. @@ -5054,10 +5055,11 @@ options { as insecure. - Configured trust anchors in trusted-keys - or managed-keys that match a disabled - algorithm will be ignored and treated as if they were not - configured at all. + Configured trust anchors in dnssec-keys + (or managed-keys or + trusted-keys, both deprecated) + that match a disabled algorithm will be ignored and treated + as if they were not configured at all. @@ -6435,8 +6437,8 @@ options { If set to yes, DNSSEC validation is enabled, but a trust anchor must be manually configured using a dnssec-keys statement (or - the synonymous managed-keys, or the - deprecated trusted-keys statements). + the managed-keys or the + trusted-keys statements, both deprecated). If there is no configured trust anchor, validation will not take place. @@ -11015,9 +11017,9 @@ example.com CNAME rpz-tcp-only. and Usage - The managed-keys statement is - identical to the dnssec-keys, and is - retained for backward compatibility. + The managed-keys statement has been + deprecated in favor of + with the initial-key keyword. @@ -11030,7 +11032,7 @@ example.com CNAME rpz-tcp-only. The trusted-keys statement has been deprecated in favor of - with the static keyword. + with the static-key keyword. @@ -11417,9 +11419,8 @@ view "external" { For validation to succeed, a key-signing key (KSK) for the zone must be configured as a trust anchor in named.conf: that - is, a key for the zone must either be specified - in managed-keys or - trusted-keys. In the case + is, a key for the zone must be specified in + dnssec-keys. In the case of the root zone, you may also rely on the built-in root trust anchor, which is enabled when See DNSSEC-KEYS. + Deprecated - see DNSSEC-KEYS. END } diff --git a/lib/irs/include/irs/dnsconf.h b/lib/irs/include/irs/dnsconf.h index 7e6f78d936..2922f753c1 100644 --- a/lib/irs/include/irs/dnsconf.h +++ b/lib/irs/include/irs/dnsconf.h @@ -17,7 +17,7 @@ * * \brief * The IRS dnsconf module parses an "advanced" configuration file related to - * the DNS library, such as trusted keys for DNSSEC validation, and creates + * the DNS library, such as trust anchors for DNSSEC validation, and creates * the corresponding configuration objects for the DNS library modules. * * Notes: diff --git a/lib/isccfg/dnsconf.c b/lib/isccfg/dnsconf.c index bbc9c6fdb4..03025fec89 100644 --- a/lib/isccfg/dnsconf.c +++ b/lib/isccfg/dnsconf.c @@ -43,7 +43,8 @@ static cfg_type_t cfg_type_trustedkeys = { */ static cfg_clausedef_t dnsconf_clauses[] = { - { "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI }, + { "trusted-keys", &cfg_type_trustedkeys, + CFG_CLAUSEFLAG_MULTI }, { NULL, NULL, 0 } };