diff --git a/CHANGES b/CHANGES index 5873831054..aac6b48b55 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +5563. [cleanup] Clean up the number of clause flags [GL #1086]. + 5562. [placeholder] 5561. [bug] KASP incorrectly set signature validity to the value diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst index bf4ba2d059..9fbe08b0ba 100644 --- a/bin/named/named.conf.rst +++ b/bin/named/named.conf.rst @@ -165,7 +165,7 @@ OPTIONS * ) ] [ dscp integer ]; answer-cookie boolean; attach-cache string; - auth-nxdomain boolean; // default changed + auth-nxdomain boolean; auto-dnssec ( allow | maintain | off ); automatic-interface-scan boolean; avoid-v4-udp-ports { portrange; ... }; @@ -519,7 +519,10 @@ TLS tls string { cert-file quoted_string; + ciphers string; // experimental + dh-param quoted_string; // experimental key-file quoted_string; + protocols sslprotos; // experimental }; TRUST-ANCHORS @@ -568,7 +571,7 @@ VIEW alt-transfer-source-v6 ( ipv6_address | * ) [ port ( integer | * ) ] [ dscp integer ]; attach-cache string; - auth-nxdomain boolean; // default changed + auth-nxdomain boolean; auto-dnssec ( allow | maintain | off ); cache-file quoted_string; catalog-zones { zone string [ default-masters [ port integer ] diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in index 6927fc9b62..9798295f4a 100644 --- a/doc/man/named.conf.5in +++ b/doc/man/named.conf.5in @@ -228,7 +228,7 @@ options { * ) ] [ dscp integer ]; answer\-cookie boolean; attach\-cache string; - auth\-nxdomain boolean; // default changed + auth\-nxdomain boolean; auto\-dnssec ( allow | maintain | off ); automatic\-interface\-scan boolean; avoid\-v4\-udp\-ports { portrange; ... }; @@ -602,7 +602,10 @@ statistics\-channels { .ft C tls string { cert\-file quoted_string; + ciphers string; // experimental + dh\-param quoted_string; // experimental key\-file quoted_string; + protocols sslprotos; // experimental }; .ft P .fi @@ -663,7 +666,7 @@ view string [ class ] { alt\-transfer\-source\-v6 ( ipv6_address | * ) [ port ( integer | * ) ] [ dscp integer ]; attach\-cache string; - auth\-nxdomain boolean; // default changed + auth\-nxdomain boolean; auto\-dnssec ( allow | maintain | off ); cache\-file quoted_string; catalog\-zones { zone string [ default\-masters [ port integer ] diff --git a/doc/misc/options b/doc/misc/options index eac0be785a..6d7bcc798f 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -63,8 +63,6 @@ logging { }; // may occur multiple times }; -lwres { }; // obsolete, may occur multiple times - managed-keys { ( static-key | initial-key | static-ds | initial-ds ) @@ -76,10 +74,6 @@ masters [ port ] [ dscp ] ) [ key ]; ... }; // may occur multiple times options { - acache-cleaning-interval ; // obsolete - acache-enable ; // obsolete - additional-from-auth ; // obsolete - additional-from-cache ; // obsolete allow-new-zones ; allow-notify { ; ... }; allow-query { ; ... }; @@ -91,7 +85,6 @@ options { allow-transfer { ; ... }; allow-update { ; ... }; allow-update-forwarding { ; ... }; - allow-v6-synthesis { ; ... }; // obsolete also-notify [ port ] [ dscp ] { ( | [ port ] | [ port ] ) [ key ]; ... }; @@ -101,7 +94,7 @@ options { * ) ] [ dscp ]; answer-cookie ; attach-cache ; - auth-nxdomain ; // default changed + auth-nxdomain ; auto-dnssec ( allow | maintain | off ); automatic-interface-scan ; avoid-v4-udp-ports { ; ... }; @@ -125,13 +118,11 @@ options { check-spf ( warn | ignore ); check-srv-cname ( fail | warn | ignore ); check-wildcard ; - cleaning-interval ; // obsolete clients-per-query ; cookie-algorithm ( aes | siphash24 ); cookie-secret ; // may occur multiple times coresize ( default | unlimited | ); datasize ( default | unlimited | ); - deallocate-on-exit ; // ancient deny-answer-addresses { ; ... } [ except-from { ; ... } ]; deny-answer-aliases { ; ... } [ except-from { ; ... @@ -158,11 +149,7 @@ options { dnsrps-options { }; dnssec-accept-expired ; dnssec-dnskey-kskonly ; - dnssec-enable ; // obsolete dnssec-loadkeys-interval ; - dnssec-lookaside ( - trust-anchor | - auto | no ); // obsolete, may occur multiple times dnssec-must-be-secure ; // may occur multiple times dnssec-policy ; dnssec-secure-to-insecure ; @@ -185,8 +172,6 @@ options { empty-contact ; empty-server ; empty-zones-enable ; - fake-iquery ; // ancient - fetch-glue ; // ancient fetch-quota-params ; fetches-per-server [ ( drop | fail ) ]; fetches-per-zone [ ( drop | fail ) ]; @@ -206,12 +191,8 @@ options { fstrm-set-output-queue-size ; fstrm-set-reopen-interval ; geoip-directory ( | none ); - geoip-use-ecs ; // obsolete glue-cache ; // deprecated - has-old-clients ; // ancient heartbeat-interval ; - host-statistics ; // ancient - host-statistics-max ; // ancient hostname ( | none ); inline-signing ; interface-interval ; @@ -231,16 +212,13 @@ options { ; ... }; // may occur multiple times lmdb-mapsize ; lock-file ( | none ); - maintain-ixfr-base ; // ancient managed-keys-directory ; masterfile-format ( map | raw | text ); masterfile-style ( full | relative ); match-mapped-addresses ; - max-acache-size ( unlimited | ); // obsolete max-cache-size ( default | unlimited | | ); max-cache-ttl ; max-clients-per-query ; - max-ixfr-log-size ( default | unlimited | ); // ancient max-ixfr-ratio ( unlimited | ); max-journal-size ( default | unlimited | ); max-ncache-ttl ; @@ -264,16 +242,12 @@ options { min-ncache-ttl ; min-refresh-time ; min-retry-time ; - min-roots ; // ancient minimal-any ; minimal-responses ( no-auth | no-auth-recursive | ); multi-master ; - multiple-cnames ; // ancient - named-xfer ; // ancient new-zones-directory ; no-case-compress { ; ... }; nocookie-udp-size ; - nosit-udp-size ; // obsolete notify ( explicit | master-only | primary-only | ); notify-delay ; notify-rate ; @@ -299,8 +273,6 @@ options { | * ) ] ) | ( [ [ address ] ( | * ) ] port ( | * ) ) ) [ dscp ]; querylog ; - queryport-pool-ports ; // obsolete - queryport-pool-updateinterval ; // obsolete random-device ( | none ); rate-limit { all-per-second ; @@ -325,7 +297,6 @@ options { request-expire ; request-ixfr ; request-nsid ; - request-sit ; // obsolete require-server-cookie ; reserved-sockets ; resolver-nonbackoff-tries ; @@ -346,14 +317,12 @@ options { [ nsip-enable ] [ nsdname-enable ] [ dnsrps-enable ] [ dnsrps-options { } ]; - rfc2308-type1 ; // ancient root-delegation-only [ exclude { ; ... } ]; root-key-sentinel ; rrset-order { [ class ] [ type ] [ name ] ; ... }; secroots-file ; send-cookie ; - serial-queries ; // ancient serial-query-rate ; serial-update-method ( date | increment | unixtime ); server-id ( | none | hostname ); @@ -365,7 +334,6 @@ options { sig-signing-signatures ; sig-signing-type ; sig-validity-interval [ ]; - sit-secret ; // obsolete sortlist { ; ... }; stacksize ( default | unlimited | ); stale-answer-enable ; @@ -374,8 +342,7 @@ options { stale-refresh-time ; startup-notify-rate ; statistics-file ; - statistics-interval ; // ancient - suppress-initial-notify ; // not yet implemented + suppress-initial-notify ; // obsolete synth-from-dnssec ; tcp-advertised-timeout ; tcp-clients ; @@ -388,7 +355,6 @@ options { tkey-gssapi-credential ; tkey-gssapi-keytab ; tls-port ; - topology { ; ... }; // ancient transfer-format ( many-answers | one-answer ); transfer-message-size ; transfer-source ( | * ) [ port ( | * ) ] [ @@ -398,14 +364,10 @@ options { transfers-in ; transfers-out ; transfers-per-ns ; - treat-cr-as-space ; // ancient trust-anchor-telemetry ; // experimental try-tcp-refresh ; update-check-ksk ; use-alt-transfer-source ; - use-id-pool ; // ancient - use-ixfr ; // obsolete - use-queryport-pool ; // obsolete use-v4-udp-ports { ; ... }; use-v6-udp-ports { ; ... }; v6-bias ; @@ -446,9 +408,7 @@ server { request-expire ; request-ixfr ; request-nsid ; - request-sit ; // obsolete send-cookie ; - support-ixfr ; // obsolete tcp-keepalive ; tcp-only ; transfer-format ( many-answers | one-answer ); @@ -468,10 +428,10 @@ statistics-channels { tls { cert-file ; - ciphers ; // not implemented - dh-param ; // not implemented + ciphers ; // experimental + dh-param ; // experimental key-file ; - protocols ; // not implemented + protocols ; // experimental }; // may occur multiple times trust-anchors { ( static-key | @@ -484,10 +444,6 @@ trusted-keys { ; ... }; // may occur multiple times, deprecated view [ ] { - acache-cleaning-interval ; // obsolete - acache-enable ; // obsolete - additional-from-auth ; // obsolete - additional-from-cache ; // obsolete allow-new-zones ; allow-notify { ; ... }; allow-query { ; ... }; @@ -499,7 +455,6 @@ view [ ] { allow-transfer { ; ... }; allow-update { ; ... }; allow-update-forwarding { ; ... }; - allow-v6-synthesis { ; ... }; // obsolete also-notify [ port ] [ dscp ] { ( | [ port ] | [ port ] ) [ key ]; ... }; @@ -508,7 +463,7 @@ view [ ] { alt-transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; attach-cache ; - auth-nxdomain ; // default changed + auth-nxdomain ; auto-dnssec ( allow | maintain | off ); cache-file ; catalog-zones { zone [ default-masters [ port ] @@ -527,7 +482,6 @@ view [ ] { check-spf ( warn | ignore ); check-srv-cname ( fail | warn | ignore ); check-wildcard ; - cleaning-interval ; // obsolete clients-per-query ; deny-answer-addresses { ; ... } [ except-from { ; ... } ]; @@ -558,11 +512,7 @@ view [ ] { dnsrps-options { }; dnssec-accept-expired ; dnssec-dnskey-kskonly ; - dnssec-enable ; // obsolete dnssec-loadkeys-interval ; - dnssec-lookaside ( - trust-anchor | - auto | no ); // obsolete, may occur multiple times dnssec-must-be-secure ; // may occur multiple times dnssec-policy ; dnssec-secure-to-insecure ; @@ -580,7 +530,6 @@ view [ ] { empty-contact ; empty-server ; empty-zones-enable ; - fetch-glue ; // ancient fetch-quota-params ; fetches-per-server [ ( drop | fail ) ]; fetches-per-zone [ ( drop | fail ) ]; @@ -604,7 +553,6 @@ view [ ] { key-directory ; lame-ttl ; lmdb-mapsize ; - maintain-ixfr-base ; // ancient managed-keys { ( static-key | initial-key | static-ds | initial-ds @@ -616,11 +564,9 @@ view [ ] { match-clients { ; ... }; match-destinations { ; ... }; match-recursive-only ; - max-acache-size ( unlimited | ); // obsolete max-cache-size ( default | unlimited | | ); max-cache-ttl ; max-clients-per-query ; - max-ixfr-log-size ( default | unlimited | ); // ancient max-ixfr-ratio ( unlimited | ); max-journal-size ( default | unlimited | ); max-ncache-ttl ; @@ -641,14 +587,12 @@ view [ ] { min-ncache-ttl ; min-refresh-time ; min-retry-time ; - min-roots ; // ancient minimal-any ; minimal-responses ( no-auth | no-auth-recursive | ); multi-master ; new-zones-directory ; no-case-compress { ; ... }; nocookie-udp-size ; - nosit-udp-size ; // obsolete notify ( explicit | master-only | primary-only | ); notify-delay ; notify-source ( | * ) [ port ( | * ) ] [ @@ -672,8 +616,6 @@ view [ ] { query-source-v6 ( ( [ address ] ( | * ) [ port ( | * ) ] ) | ( [ [ address ] ( | * ) ] port ( | * ) ) ) [ dscp ]; - queryport-pool-ports ; // obsolete - queryport-pool-updateinterval ; // obsolete rate-limit { all-per-second ; errors-per-second ; @@ -695,7 +637,6 @@ view [ ] { request-expire ; request-ixfr ; request-nsid ; - request-sit ; // obsolete require-server-cookie ; resolver-nonbackoff-tries ; resolver-query-timeout ; @@ -715,7 +656,6 @@ view [ ] { [ nsip-enable ] [ nsdname-enable ] [ dnsrps-enable ] [ dnsrps-options { } ]; - rfc2308-type1 ; // ancient root-delegation-only [ exclude { ; ... } ]; root-key-sentinel ; rrset-order { [ class ] [ type ] [ name @@ -746,9 +686,7 @@ view [ ] { request-expire ; request-ixfr ; request-nsid ; - request-sit ; // obsolete send-cookie ; - support-ixfr ; // obsolete tcp-keepalive ; tcp-only ; transfer-format ( many-answers | one-answer ); @@ -768,9 +706,8 @@ view [ ] { stale-answer-ttl ; stale-cache-enable ; stale-refresh-time ; - suppress-initial-notify ; // not yet implemented + suppress-initial-notify ; // obsolete synth-from-dnssec ; - topology { ; ... }; // ancient transfer-format ( many-answers | one-answer ); transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; @@ -788,7 +725,6 @@ view [ ] { try-tcp-refresh ; update-check-ksk ; use-alt-transfer-source ; - use-queryport-pool ; // obsolete v6-bias ; validate-except { ; ... }; zero-no-soa-ttl ; @@ -836,20 +772,15 @@ view [ ] { dscp ]; ... }; in-view ; inline-signing ; - ixfr-base ; // ancient ixfr-from-differences ; - ixfr-tmp-file ; // ancient journal ; key-directory ; - maintain-ixfr-base ; // ancient masterfile-format ( map | raw | text ); masterfile-style ( full | relative ); masters [ port ] [ dscp ] { ( | [ port ] | [ port ] ) [ key ]; ... }; - max-ixfr-log-size ( default | unlimited | - ); // ancient max-ixfr-ratio ( unlimited | ); max-journal-size ( default | unlimited | ); max-records ; @@ -875,8 +806,6 @@ view [ ] { | [ port ] | [ port ] ) [ key ]; ... }; - pubkey - ; // ancient request-expire ; request-ixfr ; serial-update-method ( date | increment | unixtime ); @@ -947,18 +876,14 @@ zone [ ] { | ) [ port ] [ dscp ]; ... }; in-view ; inline-signing ; - ixfr-base ; // ancient ixfr-from-differences ; - ixfr-tmp-file ; // ancient journal ; key-directory ; - maintain-ixfr-base ; // ancient masterfile-format ( map | raw | text ); masterfile-style ( full | relative ); masters [ port ] [ dscp ] { ( | [ port ] | [ port ] ) [ key ]; ... }; - max-ixfr-log-size ( default | unlimited | ); // ancient max-ixfr-ratio ( unlimited | ); max-journal-size ( default | unlimited | ); max-records ; @@ -983,7 +908,6 @@ zone [ ] { primaries [ port ] [ dscp ] { ( | [ port ] | [ port ] ) [ key ]; ... }; - pubkey ; // ancient request-expire ; request-ixfr ; serial-update-method ( date | increment | unixtime ); diff --git a/doc/misc/options.active b/doc/misc/options.active index b418af3c39..6d158267bf 100644 --- a/doc/misc/options.active +++ b/doc/misc/options.active @@ -93,7 +93,7 @@ options { * ) ] [ dscp ]; answer-cookie ; attach-cache ; - auth-nxdomain ; // default changed + auth-nxdomain ; auto-dnssec ( allow | maintain | off ); automatic-interface-scan ; avoid-v4-udp-ports { ; ... }; @@ -422,10 +422,10 @@ statistics-channels { tls { cert-file ; - ciphers ; // not implemented - dh-param ; // not implemented + ciphers ; // experimental + dh-param ; // experimental key-file ; - protocols ; // not implemented + protocols ; // experimental }; // may occur multiple times trust-anchors { ( static-key | @@ -457,7 +457,7 @@ view [ ] { alt-transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; attach-cache ; - auth-nxdomain ; // default changed + auth-nxdomain ; auto-dnssec ( allow | maintain | off ); cache-file ; catalog-zones { zone [ default-masters [ port ] diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst index 9dba4f965a..867256d25a 100644 --- a/doc/misc/options.grammar.rst +++ b/doc/misc/options.grammar.rst @@ -21,7 +21,7 @@ * ) ] [ dscp ]; answer-cookie ; attach-cache ; - auth-nxdomain ; // default changed + auth-nxdomain ; auto-dnssec ( allow | maintain | off ); automatic-interface-scan ; avoid-v4-udp-ports { ; ... };