From 74d83910d526006da414b1220308e33d0e8c505f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Mon, 6 Dec 2021 16:24:57 +0100 Subject: [PATCH] Mark broken-nsec option as deprecated It's unclear if we are going to keep it or not, so let's mark it as deprecated for a good measure. It's easier to un-deprecate it than the other way around. --- bin/named/named.conf.rst | 4 ++-- doc/man/named.conf.5in | 4 ++-- doc/misc/options | 4 ++-- doc/misc/options.active | 4 ++-- doc/misc/server.grammar.rst | 2 +- lib/isccfg/namedconf.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst index 6c1ec9b260..5957d38b18 100644 --- a/bin/named/named.conf.rst +++ b/bin/named/named.conf.rst @@ -514,7 +514,7 @@ SERVER server netprefix { bogus boolean; - broken-nsec boolean; + broken-nsec boolean;// deprecated edns boolean; edns-udp-size integer; edns-version integer; @@ -825,7 +825,7 @@ VIEW serial-update-method ( date | increment | unixtime ); server netprefix { bogus boolean; - broken-nsec boolean; + broken-nsec boolean;// deprecated edns boolean; edns-udp-size integer; edns-version integer; diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in index ebfc33e975..6837e0d387 100644 --- a/doc/man/named.conf.5in +++ b/doc/man/named.conf.5in @@ -597,7 +597,7 @@ primaries string [ port integer ] [ dscp .ft C server netprefix { bogus boolean; - broken\-nsec boolean; + broken\-nsec boolean;// deprecated edns boolean; edns\-udp\-size integer; edns\-version integer; @@ -928,7 +928,7 @@ view string [ class ] { serial\-update\-method ( date | increment | unixtime ); server netprefix { bogus boolean; - broken\-nsec boolean; + broken\-nsec boolean;// deprecated edns boolean; edns\-udp\-size integer; edns\-version integer; diff --git a/doc/misc/options b/doc/misc/options index f015f926a0..11e305a03b 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -420,7 +420,7 @@ primaries [ port ] [ dscp server { bogus ; - broken-nsec ; + broken-nsec ; // deprecated edns ; edns-udp-size ; edns-version ; @@ -705,7 +705,7 @@ view [ ] { serial-update-method ( date | increment | unixtime ); server { bogus ; - broken-nsec ; + broken-nsec ; // deprecated edns ; edns-udp-size ; edns-version ; diff --git a/doc/misc/options.active b/doc/misc/options.active index 882c247348..a8a915bda2 100644 --- a/doc/misc/options.active +++ b/doc/misc/options.active @@ -417,7 +417,7 @@ primaries [ port ] [ dscp server { bogus ; - broken-nsec ; + broken-nsec ; // deprecated edns ; edns-udp-size ; edns-version ; @@ -701,7 +701,7 @@ view [ ] { serial-update-method ( date | increment | unixtime ); server { bogus ; - broken-nsec ; + broken-nsec ; // deprecated edns ; edns-udp-size ; edns-version ; diff --git a/doc/misc/server.grammar.rst b/doc/misc/server.grammar.rst index 52ccccea51..9e61ad1e84 100644 --- a/doc/misc/server.grammar.rst +++ b/doc/misc/server.grammar.rst @@ -2,7 +2,7 @@ server { bogus ; - broken-nsec ; + broken-nsec ; // deprecated edns ; edns-udp-size ; edns-version ; diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index bf53b119d6..5e62fb5795 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -2515,7 +2515,7 @@ static cfg_type_t cfg_type_key = { "key", cfg_parse_named_map, */ static cfg_clausedef_t server_clauses[] = { { "bogus", &cfg_type_boolean, 0 }, - { "broken-nsec", &cfg_type_boolean, 0 }, + { "broken-nsec", &cfg_type_boolean, CFG_CLAUSEFLAG_DEPRECATED }, { "edns", &cfg_type_boolean, 0 }, { "edns-udp-size", &cfg_type_uint32, 0 }, { "edns-version", &cfg_type_uint32, 0 },