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.

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index 6c1ec9b260106cc737bcef0b46057c5f1dd82802..5957d38b1847ae8237cdfb1cbc0e0a8a43ae2905 100644 (file)
--- 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 ebfc33e9754d6575892902c7acbbff0478b0d4c9..6837e0d387d8f1ec742479cf1b24326b45d3983d 100644 (file)
--- 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 f015f926a048601df3f892c640402a3fc1134bbf..11e305a03b0f229c454d60f0e6835cb18d78931a 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -420,7 +420,7 @@ primaries <string> [ port <integer> ] [ dscp
 
 server <netprefix> {
         bogus <boolean>;
-        broken-nsec <boolean>;
+        broken-nsec <boolean>; // deprecated
         edns <boolean>;
         edns-udp-size <integer>;
         edns-version <integer>;
@@ -705,7 +705,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.active b/doc/misc/options.active
index 882c2473481756378cd74455341d5cd38a679b61..a8a915bda2e6c16aa2ad94bd6065cdebc74c1816 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -417,7 +417,7 @@ primaries <string> [ port <integer> ] [ dscp
 
 server <netprefix> {
         bogus <boolean>;
-        broken-nsec <boolean>;
+        broken-nsec <boolean>; // deprecated
         edns <boolean>;
         edns-udp-size <integer>;
         edns-version <integer>;
@@ -701,7 +701,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/server.grammar.rst b/doc/misc/server.grammar.rst
index 52ccccea5177157316229b3be17198f12f5d7166..9e61ad1e845639aee4465c73a6ba00917e435190 100644 (file)
--- a/doc/misc/server.grammar.rst
+++ b/doc/misc/server.grammar.rst
@@ -2,7 +2,7 @@
 
   server <netprefix> {
        bogus <boolean>;
-       broken-nsec <boolean>;
+       broken-nsec <boolean>; // deprecated
        edns <boolean>;
        edns-udp-size <integer>;
        edns-version <integer>;

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