add a CFG_CLAUSEFLAG_NODOC flag for use with outdated terms

"masters" and "default-masters" are now flagged so they will
not be included in the named.conf man page, despite being
accepted as valid options by the parser for backward
compatibiility.

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index d361babb55fed73fd57ac9ba03d019a9b1b63c58..57d603b94e008891d88327cc58e0a82baa06b39d 100644 (file)
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -152,17 +152,6 @@ See DNSSEC-KEYS.
       initial-ds ) integer integer
       integer quoted_string; ... };, deprecated
 
-MASTERS
-^^^^^^^
-
-::
-
-  masters string [ port integer ] [ dscp
-      integer ] { ( remote-servers |
-      ipv4_address [ port integer ] |
-      ipv6_address [ port integer ] ) [ key
-      string ] [ tls string ]; ... };
-
 OPTIONS
 ^^^^^^^
 
@@ -198,15 +187,12 @@ OPTIONS
        avoid-v6-udp-ports { portrange; ... };
        bindkeys-file quoted_string;
        blackhole { address_match_element; ... };
-       catalog-zones { zone string [ default-masters [ port integer ]
-           [ dscp integer ] { ( remote-servers | ipv4_address [ port
-           integer ] | ipv6_address [ port integer ] ) [ key
-           string ] [ tls string ]; ... } ] [ default-primaries [ port
-           integer ] [ dscp integer ] { ( remote-servers |
-           ipv4_address [ port integer ] | ipv6_address [ port
-           integer ] ) [ key string ] [ tls string ]; ... } ] [
-           zone-directory quoted_string ] [ in-memory boolean ] [
-           min-update-interval duration ]; ... };
+       catalog-zones { zone string [ default-primaries [ port integer
+           ] [ dscp integer ] { ( remote-servers | ipv4_address [
+           port integer ] | ipv6_address [ port integer ] ) [ key
+           string ] [ tls string ]; ... } ] [ zone-directory
+           quoted_string ] [ in-memory boolean ] [ min-update-interval
+           duration ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity boolean;
        check-mx ( fail | warn | ignore );
@@ -631,15 +617,12 @@ VIEW
        attach-cache string;
        auth-nxdomain boolean;
        auto-dnssec ( allow | maintain | off );
-       catalog-zones { zone string [ default-masters [ port integer ]
-           [ dscp integer ] { ( remote-servers | ipv4_address [ port
-           integer ] | ipv6_address [ port integer ] ) [ key
-           string ] [ tls string ]; ... } ] [ default-primaries [ port
-           integer ] [ dscp integer ] { ( remote-servers |
-           ipv4_address [ port integer ] | ipv6_address [ port
-           integer ] ) [ key string ] [ tls string ]; ... } ] [
-           zone-directory quoted_string ] [ in-memory boolean ] [
-           min-update-interval duration ]; ... };
+       catalog-zones { zone string [ default-primaries [ port integer
+           ] [ dscp integer ] { ( remote-servers | ipv4_address [
+           port integer ] | ipv6_address [ port integer ] ) [ key
+           string ] [ tls string ]; ... } ] [ zone-directory
+           quoted_string ] [ in-memory boolean ] [ min-update-interval
+           duration ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity boolean;
        check-mx ( fail | warn | ignore );
@@ -946,10 +929,6 @@ VIEW
                key-directory quoted_string;
                masterfile-format ( raw | text );
                masterfile-style ( full | relative );
-               masters [ port integer ] [ dscp integer ] { (
-                   remote-servers | ipv4_address [ port integer ] |
-                   ipv6_address [ port integer ] ) [ key string ] [
-                   tls string ]; ... };
                max-ixfr-ratio ( unlimited | percentage );
                max-journal-size ( default | unlimited | sizeval );
                max-records integer;
@@ -1065,9 +1044,6 @@ ZONE
        key-directory quoted_string;
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port integer ] [ dscp integer ] { ( remote-servers
-           | ipv4_address [ port integer ] | ipv6_address [ port
-           integer ] ) [ key string ] [ tls string ]; ... };
        max-ixfr-ratio ( unlimited | percentage );
        max-journal-size ( default | unlimited | sizeval );
        max-records integer;

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index dcc48ec42a4e041a63e5f51daea194de9b9d8d7a..bd8ffc8eb233d261ab4845c4e52026c0be94afe5 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -203,21 +203,6 @@ managed\-keys { string ( static\-key
 .fi
 .UNINDENT
 .UNINDENT
-.SS MASTERS
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-masters string [ port integer ] [ dscp
-    integer ] { ( remote\-servers |
-    ipv4_address [ port integer ] |
-    ipv6_address [ port integer ] ) [ key
-    string ] [ tls string ]; ... };
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
 .SS OPTIONS
 .INDENT 0.0
 .INDENT 3.5
@@ -254,15 +239,12 @@ options {
       avoid\-v6\-udp\-ports { portrange; ... };
       bindkeys\-file quoted_string;
       blackhole { address_match_element; ... };
-      catalog\-zones { zone string [ default\-masters [ port integer ]
-          [ dscp integer ] { ( remote\-servers | ipv4_address [ port
-          integer ] | ipv6_address [ port integer ] ) [ key
-          string ] [ tls string ]; ... } ] [ default\-primaries [ port
-          integer ] [ dscp integer ] { ( remote\-servers |
-          ipv4_address [ port integer ] | ipv6_address [ port
-          integer ] ) [ key string ] [ tls string ]; ... } ] [
-          zone\-directory quoted_string ] [ in\-memory boolean ] [
-          min\-update\-interval duration ]; ... };
+      catalog\-zones { zone string [ default\-primaries [ port integer
+          ] [ dscp integer ] { ( remote\-servers | ipv4_address [
+          port integer ] | ipv6_address [ port integer ] ) [ key
+          string ] [ tls string ]; ... } ] [ zone\-directory
+          quoted_string ] [ in\-memory boolean ] [ min\-update\-interval
+          duration ]; ... };
       check\-dup\-records ( fail | warn | ignore );
       check\-integrity boolean;
       check\-mx ( fail | warn | ignore );
@@ -723,15 +705,12 @@ view string [ class ] {
       attach\-cache string;
       auth\-nxdomain boolean;
       auto\-dnssec ( allow | maintain | off );
-      catalog\-zones { zone string [ default\-masters [ port integer ]
-          [ dscp integer ] { ( remote\-servers | ipv4_address [ port
-          integer ] | ipv6_address [ port integer ] ) [ key
-          string ] [ tls string ]; ... } ] [ default\-primaries [ port
-          integer ] [ dscp integer ] { ( remote\-servers |
-          ipv4_address [ port integer ] | ipv6_address [ port
-          integer ] ) [ key string ] [ tls string ]; ... } ] [
-          zone\-directory quoted_string ] [ in\-memory boolean ] [
-          min\-update\-interval duration ]; ... };
+      catalog\-zones { zone string [ default\-primaries [ port integer
+          ] [ dscp integer ] { ( remote\-servers | ipv4_address [
+          port integer ] | ipv6_address [ port integer ] ) [ key
+          string ] [ tls string ]; ... } ] [ zone\-directory
+          quoted_string ] [ in\-memory boolean ] [ min\-update\-interval
+          duration ]; ... };
       check\-dup\-records ( fail | warn | ignore );
       check\-integrity boolean;
       check\-mx ( fail | warn | ignore );
@@ -1038,10 +1017,6 @@ view string [ class ] {
               key\-directory quoted_string;
               masterfile\-format ( raw | text );
               masterfile\-style ( full | relative );
-              masters [ port integer ] [ dscp integer ] { (
-                  remote\-servers | ipv4_address [ port integer ] |
-                  ipv6_address [ port integer ] ) [ key string ] [
-                  tls string ]; ... };
               max\-ixfr\-ratio ( unlimited | percentage );
               max\-journal\-size ( default | unlimited | sizeval );
               max\-records integer;
@@ -1161,9 +1136,6 @@ zone string [ class ] {
       key\-directory quoted_string;
       masterfile\-format ( raw | text );
       masterfile\-style ( full | relative );
-      masters [ port integer ] [ dscp integer ] { ( remote\-servers
-          | ipv4_address [ port integer ] | ipv6_address [ port
-          integer ] ) [ key string ] [ tls string ]; ... };
       max\-ixfr\-ratio ( unlimited | percentage );
       max\-journal\-size ( default | unlimited | sizeval );
       max\-records integer;

diff --git a/doc/misc/mirror.zoneopt b/doc/misc/mirror.zoneopt
index a21182789d7427655f466d4685a1fdc9321ca4b9..8b673c2409f61da721b337177acc118eceb24a78 100644 (file)
--- a/doc/misc/mirror.zoneopt
+++ b/doc/misc/mirror.zoneopt
@@ -15,7 +15,6 @@ zone <string> [ <class> ] {
        journal <quoted_string>;
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-ixfr-ratio ( unlimited | <percentage> );
        max-journal-size ( default | unlimited | <sizeval> );
        max-records <integer>;

diff --git a/doc/misc/mirror.zoneopt.rst b/doc/misc/mirror.zoneopt.rst
index f747c6d9e608e81e782ceddb7c8d0874187741c0..6262f4b7124368e23e63df9e331a58ef90af56b6 100644 (file)
--- a/doc/misc/mirror.zoneopt.rst
+++ b/doc/misc/mirror.zoneopt.rst
@@ -28,7 +28,6 @@
        journal <quoted_string>;
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-ixfr-ratio ( unlimited | <percentage> );
        max-journal-size ( default | unlimited | <sizeval> );
        max-records <integer>;

diff --git a/doc/misc/options b/doc/misc/options
index 3a8730c3acad4239284e9297ce373b773fcb9a75..2aca017155d5b18e27dcb8502f65707122cf7ade 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -75,12 +75,6 @@ managed-keys { <string> ( static-key
     initial-ds ) <integer> <integer>
     <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
 
-masters <string> [ port <integer> ] [ dscp
-    <integer> ] { ( <remote-servers> |
-    <ipv4_address> [ port <integer> ] |
-    <ipv6_address> [ port <integer> ] ) [ key
-    <string> ] [ tls <string> ]; ... }; // may occur multiple times
-
 options {
         allow-new-zones <boolean>;
         allow-notify { <address_match_element>; ... };
@@ -111,15 +105,12 @@ options {
         avoid-v6-udp-ports { <portrange>; ... };
         bindkeys-file <quoted_string>;
         blackhole { <address_match_element>; ... };
-        catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
-            <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
-            <string> ] [ tls <string> ]; ... } ] [ default-primaries [ port
-            <integer> ] [ dscp <integer> ] { ( <remote-servers> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [
-            zone-directory <quoted_string> ] [ in-memory <boolean> ] [
-            min-update-interval <duration> ]; ... };
+        catalog-zones { zone <string> [ default-primaries [ port <integer>
+            ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [
+            port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
+            <string> ] [ tls <string> ]; ... } ] [ zone-directory
+            <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval
+            <duration> ]; ... };
         check-dup-records ( fail | warn | ignore );
         check-integrity <boolean>;
         check-mx ( fail | warn | ignore );
@@ -500,15 +491,12 @@ view <string> [ <class> ] {
         attach-cache <string>;
         auth-nxdomain <boolean>;
         auto-dnssec ( allow | maintain | off );
-        catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
-            <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
-            <string> ] [ tls <string> ]; ... } ] [ default-primaries [ port
-            <integer> ] [ dscp <integer> ] { ( <remote-servers> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [
-            zone-directory <quoted_string> ] [ in-memory <boolean> ] [
-            min-update-interval <duration> ]; ... };
+        catalog-zones { zone <string> [ default-primaries [ port <integer>
+            ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [
+            port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
+            <string> ] [ tls <string> ]; ... } ] [ zone-directory
+            <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval
+            <duration> ]; ... };
         check-dup-records ( fail | warn | ignore );
         check-integrity <boolean>;
         check-mx ( fail | warn | ignore );
@@ -817,10 +805,6 @@ view <string> [ <class> ] {
                 key-directory <quoted_string>;
                 masterfile-format ( raw | text );
                 masterfile-style ( full | relative );
-                masters [ port <integer> ] [ dscp <integer> ] { (
-                    <remote-servers> | <ipv4_address> [ port <integer> ] |
-                    <ipv6_address> [ port <integer> ] ) [ key <string> ] [
-                    tls <string> ]; ... };
                 max-ixfr-ratio ( unlimited | <percentage> );
                 max-journal-size ( default | unlimited | <sizeval> );
                 max-records <integer>;
@@ -932,9 +916,6 @@ zone <string> [ <class> ] {
         key-directory <quoted_string>;
         masterfile-format ( raw | text );
         masterfile-style ( full | relative );
-        masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers>
-            | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
         max-ixfr-ratio ( unlimited | <percentage> );
         max-journal-size ( default | unlimited | <sizeval> );
         max-records <integer>;

diff --git a/doc/misc/options.active b/doc/misc/options.active
index 8c97c2d97c111490ee24c7123a5f67bef8953fc8..7944b1d10554efc215c45cae79fca230b98bc9c2 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -74,12 +74,6 @@ managed-keys { <string> ( static-key
     initial-ds ) <integer> <integer>
     <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
 
-masters <string> [ port <integer> ] [ dscp
-    <integer> ] { ( <remote-servers> |
-    <ipv4_address> [ port <integer> ] |
-    <ipv6_address> [ port <integer> ] ) [ key
-    <string> ] [ tls <string> ]; ... }; // may occur multiple times
-
 options {
         allow-new-zones <boolean>;
         allow-notify { <address_match_element>; ... };
@@ -110,15 +104,12 @@ options {
         avoid-v6-udp-ports { <portrange>; ... };
         bindkeys-file <quoted_string>;
         blackhole { <address_match_element>; ... };
-        catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
-            <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
-            <string> ] [ tls <string> ]; ... } ] [ default-primaries [ port
-            <integer> ] [ dscp <integer> ] { ( <remote-servers> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [
-            zone-directory <quoted_string> ] [ in-memory <boolean> ] [
-            min-update-interval <duration> ]; ... };
+        catalog-zones { zone <string> [ default-primaries [ port <integer>
+            ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [
+            port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
+            <string> ] [ tls <string> ]; ... } ] [ zone-directory
+            <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval
+            <duration> ]; ... };
         check-dup-records ( fail | warn | ignore );
         check-integrity <boolean>;
         check-mx ( fail | warn | ignore );
@@ -496,15 +487,12 @@ view <string> [ <class> ] {
         attach-cache <string>;
         auth-nxdomain <boolean>;
         auto-dnssec ( allow | maintain | off );
-        catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
-            <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
-            <string> ] [ tls <string> ]; ... } ] [ default-primaries [ port
-            <integer> ] [ dscp <integer> ] { ( <remote-servers> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [
-            zone-directory <quoted_string> ] [ in-memory <boolean> ] [
-            min-update-interval <duration> ]; ... };
+        catalog-zones { zone <string> [ default-primaries [ port <integer>
+            ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [
+            port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
+            <string> ] [ tls <string> ]; ... } ] [ zone-directory
+            <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval
+            <duration> ]; ... };
         check-dup-records ( fail | warn | ignore );
         check-integrity <boolean>;
         check-mx ( fail | warn | ignore );
@@ -811,10 +799,6 @@ view <string> [ <class> ] {
                 key-directory <quoted_string>;
                 masterfile-format ( raw | text );
                 masterfile-style ( full | relative );
-                masters [ port <integer> ] [ dscp <integer> ] { (
-                    <remote-servers> | <ipv4_address> [ port <integer> ] |
-                    <ipv6_address> [ port <integer> ] ) [ key <string> ] [
-                    tls <string> ]; ... };
                 max-ixfr-ratio ( unlimited | <percentage> );
                 max-journal-size ( default | unlimited | <sizeval> );
                 max-records <integer>;
@@ -925,9 +909,6 @@ zone <string> [ <class> ] {
         key-directory <quoted_string>;
         masterfile-format ( raw | text );
         masterfile-style ( full | relative );
-        masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers>
-            | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
         max-ixfr-ratio ( unlimited | <percentage> );
         max-journal-size ( default | unlimited | <sizeval> );
         max-records <integer>;

diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
index c03505f2e9098e59dda0226dd2479f524c07ec2a..1ce0353b320fada22715156f58413c191751b40b 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -41,15 +41,12 @@
        avoid-v6-udp-ports { <portrange>; ... };
        bindkeys-file <quoted_string>;
        blackhole { <address_match_element>; ... };
-       catalog-zones { zone <string> [ default-masters [ port <integer> ]
-           [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
-           <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
-           <string> ] [ tls <string> ]; ... } ] [ default-primaries [ port
-           <integer> ] [ dscp <integer> ] { ( <remote-servers> |
-           <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-           <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [
-           zone-directory <quoted_string> ] [ in-memory <boolean> ] [
-           min-update-interval <duration> ]; ... };
+       catalog-zones { zone <string> [ default-primaries [ port <integer>
+           ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [
+           port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
+           <string> ] [ tls <string> ]; ... } ] [ zone-directory
+           <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval
+           <duration> ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity <boolean>;
        check-mx ( fail | warn | ignore );

diff --git a/doc/misc/redirect.zoneopt b/doc/misc/redirect.zoneopt
index d79b44a4aa6e0e432a72704d7c21bc0f2f577130..1c34bb11f19625f3a50733a12866b8b6d684b990 100644 (file)
--- a/doc/misc/redirect.zoneopt
+++ b/doc/misc/redirect.zoneopt
@@ -6,7 +6,6 @@ zone <string> [ <class> ] {
        file <quoted_string>;
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-records <integer>;
        max-zone-ttl ( unlimited | <duration> );
        primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };

diff --git a/doc/misc/redirect.zoneopt.rst b/doc/misc/redirect.zoneopt.rst
index a7df8ff771a0b1e1ab251ac9165f0f68f59123ad..53e9883e7600b6ad65d1460c99858aa5e3ad5a89 100644 (file)
--- a/doc/misc/redirect.zoneopt.rst
+++ b/doc/misc/redirect.zoneopt.rst
@@ -19,7 +19,6 @@
        file <quoted_string>;
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-records <integer>;
        max-zone-ttl ( unlimited | <duration> );
        primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };

diff --git a/doc/misc/slave.zoneopt b/doc/misc/slave.zoneopt
index 5fbbc065bce4998ea0602eb9e501b11d8f545485..595e94b5481db3125d706309c99c7ef9758ac0b8 100644 (file)
--- a/doc/misc/slave.zoneopt
+++ b/doc/misc/slave.zoneopt
@@ -27,7 +27,6 @@ zone <string> [ <class> ] {
        key-directory <quoted_string>;
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-ixfr-ratio ( unlimited | <percentage> );
        max-journal-size ( default | unlimited | <sizeval> );
        max-records <integer>;

diff --git a/doc/misc/slave.zoneopt.rst b/doc/misc/slave.zoneopt.rst
index 2cef150a0f1364e6cf6cf81e34da506e187b3572..5e0e84b7c3aa6ead3ab13eb1359e47919a19cdf4 100644 (file)
--- a/doc/misc/slave.zoneopt.rst
+++ b/doc/misc/slave.zoneopt.rst
@@ -40,7 +40,6 @@
        key-directory <quoted_string>;
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-ixfr-ratio ( unlimited | <percentage> );
        max-journal-size ( default | unlimited | <sizeval> );
        max-records <integer>;

diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt
index b1b9850c3d96c8213bb481fadf2a7509b93bca73..305585b9e0e834ae319527c584622d42c8d17273 100644 (file)
--- a/doc/misc/stub.zoneopt
+++ b/doc/misc/stub.zoneopt
@@ -11,7 +11,6 @@ zone <string> [ <class> ] {
        forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-records <integer>;
        max-refresh-time <integer>;
        max-retry-time <integer>;

diff --git a/doc/misc/stub.zoneopt.rst b/doc/misc/stub.zoneopt.rst
index d7eb4d41e432ec8d2c89f694800f552862765d51..d18720b12a97b49ee6dc31972fcc351dd49118f0 100644 (file)
--- a/doc/misc/stub.zoneopt.rst
+++ b/doc/misc/stub.zoneopt.rst
@@ -24,7 +24,6 @@
        forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        max-records <integer>;
        max-refresh-time <integer>;
        max-retry-time <integer>;

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 8609cd9aa55ee93a3f033ce758265196d3a5d933..660f81286946959ea4a52092928ccab09ff1d7f0 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -44,13 +44,14 @@
  * "directory" option.
  */
 #define CFG_CLAUSEFLAG_CALLBACK 0x00000020
-/*% A option that is only used in testing. */
+/*% An option that is only used in testing. */
 #define CFG_CLAUSEFLAG_TESTONLY 0x00000040
 /*% A configuration option that was not configured at compile time. */
 #define CFG_CLAUSEFLAG_NOTCONFIGURED 0x00000080
-/*% A option for a experimental feature. */
+/*% An option for an experimental feature. */
 #define CFG_CLAUSEFLAG_EXPERIMENTAL 0x00000100
-/* obsolete: #define CFG_CLAUSEFLAG_NOOP 0x00000200 */
+/*% An option that should be omited from the documentation */
+#define CFG_CLAUSEFLAG_NODOC 0x00000200
 /*% Clause will be obsolete in a future release (logs a warning) */
 #define CFG_CLAUSEFLAG_DEPRECATED 0x00000400
 /*% Clause has been obsolete so long that it's now a fatal error */

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 83cc6003765ddbfc6080b3da2dbb69af6927abff..5fa822c05f566cee175a7198794627fd8636bd69 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1157,7 +1157,8 @@ static cfg_clausedef_t namedconf_clauses[] = {
 #endif
        { "logging", &cfg_type_logging, 0 },
        { "lwres", NULL, CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_ANCIENT },
-       { "masters", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI },
+       { "masters", &cfg_type_remoteservers,
+         CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_NODOC },
        { "options", &cfg_type_options, 0 },
        { "parental-agents", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI },
        { "primaries", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI },
@@ -1777,6 +1778,9 @@ cfg_doc_kv_tuple(cfg_printer_t *pctx, const cfg_type_t *type) {
 
        fields = type->of;
        for (f = fields; f->name != NULL; f++) {
+               if ((f->flags & CFG_CLAUSEFLAG_NODOC) != 0) {
+                       continue;
+               }
                if (f != fields) {
                        cfg_print_cstr(pctx, " [ ");
                        cfg_print_cstr(pctx, f->name);
@@ -1878,7 +1882,8 @@ static cfg_type_t cfg_type_catz_zone = { "zone",    parse_keyvalue,
 
 static cfg_tuplefielddef_t catz_zone_fields[] = {
        { "zone name", &cfg_type_catz_zone, 0 },
-       { "default-masters", &cfg_type_namesockaddrkeylist, 0 },
+       { "default-masters", &cfg_type_namesockaddrkeylist,
+         CFG_CLAUSEFLAG_NODOC },
        { "default-primaries", &cfg_type_namesockaddrkeylist, 0 },
        { "zone-directory", &cfg_type_qstring, 0 },
        { "in-memory", &cfg_type_boolean, 0 },
@@ -2389,7 +2394,7 @@ static cfg_clausedef_t zone_only_clauses[] = {
          CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR },
        { "masters", &cfg_type_namesockaddrkeylist,
          CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR | CFG_ZONE_STUB |
-                 CFG_ZONE_REDIRECT },
+                 CFG_ZONE_REDIRECT | CFG_CLAUSEFLAG_NODOC },
        { "parental-agents", &cfg_type_namesockaddrkeylist,
          CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY },
        { "primaries", &cfg_type_namesockaddrkeylist,
@@ -3899,7 +3904,9 @@ cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags,
                {
                        continue;
                }
-               if ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0) {
+               if ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0 ||
+                   (clause->flags & CFG_CLAUSEFLAG_NODOC) != 0)
+               {
                        continue;
                }
 

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 15018c9c15fb4199c71324cc5dce4008a4628d1e..1b4e164725a89efe1a150d2b5bf4bf9c36d6d5aa 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -2731,7 +2731,9 @@ cfg_doc_mapbody(cfg_printer_t *pctx, const cfg_type_t *type) {
                        {
                                continue;
                        }
-                       if ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0) {
+                       if ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0 ||
+                           (clause->flags & CFG_CLAUSEFLAG_NODOC) != 0)
+                       {
                                continue;
                        }
                        cfg_print_cstr(pctx, clause->name);
@@ -2787,7 +2789,9 @@ cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) {
                        {
                                continue;
                        }
-                       if ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0) {
+                       if ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0 ||
+                           (clause->flags & CFG_CLAUSEFLAG_NODOC) != 0)
+                       {
                                continue;
                        }
                        cfg_print_indent(pctx);