Change primaries objects to remote-servers

Change the primaries configuration objects to the more generic
remote-servers, that we can reuse for other purposes (such as
parental-agents).

diff --git a/bin/named/config.c b/bin/named/config.c
index 10087b47f3a912d7716d397b2037f5de30d71449..86896efc51af743aed19dc819e72e25226080002 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -767,7 +767,7 @@ resume:
                const cfg_obj_t *tls;
 
                addr = cfg_tuple_get(cfg_listelt_value(element),
-                                    "primarieselement");
+                                    "remoteselement");
                key = cfg_tuple_get(cfg_listelt_value(element), "key");
                tls = cfg_tuple_get(cfg_listelt_value(element), "tls");
 

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index 39407490f60ff88ab2d9afc080b70b2fed42994e..cc3aad616c3f2a3fb5d0d08a8ce5b2000f8cf956 100644 (file)
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -145,10 +145,10 @@ MASTERS
 ::
 
   masters string [ port integer ] [ dscp
-      integer ] { ( primaries | ipv4_address
-      [ port integer ] | ipv6_address [ port
-      integer ] ) [ key string ] [ tls
-      string ]; ... };
+      integer ] { ( remote-servers |
+      ipv4_address [ port integer ] |
+      ipv6_address [ port integer ] ) [ key
+      string ] [ tls string ]; ... };
 
 OPTIONS
 ^^^^^^^
@@ -167,9 +167,10 @@ OPTIONS
        allow-transfer { address_match_element; ... };
        allow-update { address_match_element; ... };
        allow-update-forwarding { address_match_element; ... };
-       also-notify [ port integer ] [ dscp integer ] { ( primaries |
-           ipv4_address [ port integer ] | ipv6_address [ port
-           integer ] ) [ key string ] [ tls string ]; ... };
+       also-notify [ port integer ] [ dscp integer ] { (
+           remote-servers | ipv4_address [ port integer ] |
+           ipv6_address [ port integer ] ) [ key string ] [ tls
+           string ]; ... };
        alt-transfer-source ( ipv4_address | * ) [ port ( integer | * )
            ] [ dscp integer ];
        alt-transfer-source-v6 ( ipv6_address | * ) [ port ( integer |
@@ -185,7 +186,7 @@ OPTIONS
        blackhole { address_match_element; ... };
        cache-file quoted_string;
        catalog-zones { zone string [ default-masters [ port integer ]
-           [ dscp integer ] { ( primaries | ipv4_address [ port
+           [ 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
@@ -478,10 +479,10 @@ PRIMARIES
 ::
 
   primaries string [ port integer ] [ dscp
-      integer ] { ( primaries | ipv4_address
-      [ port integer ] | ipv6_address [ port
-      integer ] ) [ key string ] [ tls
-      string ]; ... };
+      integer ] { ( remote-servers |
+      ipv4_address [ port integer ] |
+      ipv6_address [ port integer ] ) [ key
+      string ] [ tls string ]; ... };
 
 SERVER
 ^^^^^^
@@ -586,9 +587,10 @@ VIEW
        allow-transfer { address_match_element; ... };
        allow-update { address_match_element; ... };
        allow-update-forwarding { address_match_element; ... };
-       also-notify [ port integer ] [ dscp integer ] { ( primaries |
-           ipv4_address [ port integer ] | ipv6_address [ port
-           integer ] ) [ key string ] [ tls string ]; ... };
+       also-notify [ port integer ] [ dscp integer ] { (
+           remote-servers | ipv4_address [ port integer ] |
+           ipv6_address [ port integer ] ) [ key string ] [ tls
+           string ]; ... };
        alt-transfer-source ( ipv4_address | * ) [ port ( integer | * )
            ] [ dscp integer ];
        alt-transfer-source-v6 ( ipv6_address | * ) [ port ( integer |
@@ -598,7 +600,7 @@ VIEW
        auto-dnssec ( allow | maintain | off );
        cache-file quoted_string;
        catalog-zones { zone string [ default-masters [ port integer ]
-           [ dscp integer ] { ( primaries | ipv4_address [ port
+           [ 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
@@ -864,7 +866,7 @@ VIEW
                allow-update { address_match_element; ... };
                allow-update-forwarding { address_match_element; ... };
                also-notify [ port integer ] [ dscp integer ] { (
-                   primaries | ipv4_address [ port integer ] |
+                   remote-servers | ipv4_address [ port integer ] |
                    ipv6_address [ port integer ] ) [ key string ] [
                    tls string ]; ... };
                alt-transfer-source ( ipv4_address | * ) [ port (
@@ -905,7 +907,7 @@ VIEW
                masterfile-format ( map | raw | text );
                masterfile-style ( full | relative );
                masters [ port integer ] [ dscp integer ] { (
-                   primaries | ipv4_address [ port integer ] |
+                   remote-servers | ipv4_address [ port integer ] |
                    ipv6_address [ port integer ] ) [ key string ] [
                    tls string ]; ... };
                max-ixfr-ratio ( unlimited | percentage );
@@ -929,7 +931,7 @@ VIEW
                    | * ) ] [ dscp integer ];
                notify-to-soa boolean;
                primaries [ port integer ] [ dscp integer ] { (
-                   primaries | ipv4_address [ port integer ] |
+                   remote-servers | ipv4_address [ port integer ] |
                    ipv6_address [ port integer ] ) [ key string ] [
                    tls string ]; ... };
                request-expire boolean;
@@ -974,9 +976,10 @@ ZONE
        allow-transfer { address_match_element; ... };
        allow-update { address_match_element; ... };
        allow-update-forwarding { address_match_element; ... };
-       also-notify [ port integer ] [ dscp integer ] { ( primaries |
-           ipv4_address [ port integer ] | ipv6_address [ port
-           integer ] ) [ key string ] [ tls string ]; ... };
+       also-notify [ port integer ] [ dscp integer ] { (
+           remote-servers | ipv4_address [ port integer ] |
+           ipv6_address [ port integer ] ) [ key string ] [ tls
+           string ]; ... };
        alt-transfer-source ( ipv4_address | * ) [ port ( integer | * )
            ] [ dscp integer ];
        alt-transfer-source-v6 ( ipv6_address | * ) [ port ( integer |
@@ -1012,8 +1015,8 @@ ZONE
        key-directory quoted_string;
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port integer ] [ dscp integer ] { ( primaries |
-           ipv4_address [ port integer ] | ipv6_address [ port
+       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 );
@@ -1035,9 +1038,10 @@ ZONE
        notify-source-v6 ( ipv6_address | * ) [ port ( integer | * ) ]
            [ dscp integer ];
        notify-to-soa boolean;
-       primaries [ port integer ] [ dscp integer ] { ( primaries |
-           ipv4_address [ port integer ] | ipv6_address [ port
-           integer ] ) [ key string ] [ tls string ]; ... };
+       primaries [ port integer ] [ dscp integer ] { (
+           remote-servers | ipv4_address [ port integer ] |
+           ipv6_address [ port integer ] ) [ key string ] [ tls
+           string ]; ... };
        request-expire boolean;
        request-ixfr boolean;
        serial-update-method ( date | increment | unixtime );

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index f8eb970f10eb7aa07fffe968a3d6cf5c7a5d2419..4f563d4ed28a1cdf8c39d2f6bee0c6f286413246 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -29,8 +29,8 @@ file documentation:
     ``address_match_list``
         A list of one or more ``ip_addr``, ``ip_prefix``, ``key_id``, or ``acl_name`` elements; see :ref:`address_match_lists`.
 
-    ``primaries_list``
-        A named list of one or more ``ip_addr`` with optional ``tls_id``, ``key_id`` and/or ``ip_port``. A ``primaries_list`` may include other ``primaries_list``.
+    ``remoteserver_list``
+        A named list of one or more ``ip_addr`` with optional ``tls_id``, ``key_id`` and/or ``ip_port``. A ``remoteserver_list`` may include other ``remoteserver_list``.
 
     ``domain_name``
         A quoted string which is used as a DNS name; for example. ``my.test.domain``.

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index 5a311c30db48cbf4a52ed8374a253115ddb180a6..ac1a1555f907838050657315fc5a4722563ad6d7 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -208,10 +208,10 @@ managed\-keys { string ( static\-key
 .nf
 .ft C
 masters string [ port integer ] [ dscp
-    integer ] { ( primaries | ipv4_address
-    [ port integer ] | ipv6_address [ port
-    integer ] ) [ key string ] [ tls
-    string ]; ... };
+    integer ] { ( remote\-servers |
+    ipv4_address [ port integer ] |
+    ipv6_address [ port integer ] ) [ key
+    string ] [ tls string ]; ... };
 .ft P
 .fi
 .UNINDENT
@@ -234,9 +234,10 @@ options {
       allow\-transfer { address_match_element; ... };
       allow\-update { address_match_element; ... };
       allow\-update\-forwarding { address_match_element; ... };
-      also\-notify [ port integer ] [ dscp integer ] { ( primaries |
-          ipv4_address [ port integer ] | ipv6_address [ port
-          integer ] ) [ key string ] [ tls string ]; ... };
+      also\-notify [ port integer ] [ dscp integer ] { (
+          remote\-servers | ipv4_address [ port integer ] |
+          ipv6_address [ port integer ] ) [ key string ] [ tls
+          string ]; ... };
       alt\-transfer\-source ( ipv4_address | * ) [ port ( integer | * )
           ] [ dscp integer ];
       alt\-transfer\-source\-v6 ( ipv6_address | * ) [ port ( integer |
@@ -252,7 +253,7 @@ options {
       blackhole { address_match_element; ... };
       cache\-file quoted_string;
       catalog\-zones { zone string [ default\-masters [ port integer ]
-          [ dscp integer ] { ( primaries | ipv4_address [ port
+          [ 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
@@ -553,10 +554,10 @@ plugin ( query ) string [ { unspecified\-text
 .nf
 .ft C
 primaries string [ port integer ] [ dscp
-    integer ] { ( primaries | ipv4_address
-    [ port integer ] | ipv6_address [ port
-    integer ] ) [ key string ] [ tls
-    string ]; ... };
+    integer ] { ( remote\-servers |
+    ipv4_address [ port integer ] |
+    ipv6_address [ port integer ] ) [ key
+    string ] [ tls string ]; ... };
 .ft P
 .fi
 .UNINDENT
@@ -685,9 +686,10 @@ view string [ class ] {
       allow\-transfer { address_match_element; ... };
       allow\-update { address_match_element; ... };
       allow\-update\-forwarding { address_match_element; ... };
-      also\-notify [ port integer ] [ dscp integer ] { ( primaries |
-          ipv4_address [ port integer ] | ipv6_address [ port
-          integer ] ) [ key string ] [ tls string ]; ... };
+      also\-notify [ port integer ] [ dscp integer ] { (
+          remote\-servers | ipv4_address [ port integer ] |
+          ipv6_address [ port integer ] ) [ key string ] [ tls
+          string ]; ... };
       alt\-transfer\-source ( ipv4_address | * ) [ port ( integer | * )
           ] [ dscp integer ];
       alt\-transfer\-source\-v6 ( ipv6_address | * ) [ port ( integer |
@@ -697,7 +699,7 @@ view string [ class ] {
       auto\-dnssec ( allow | maintain | off );
       cache\-file quoted_string;
       catalog\-zones { zone string [ default\-masters [ port integer ]
-          [ dscp integer ] { ( primaries | ipv4_address [ port
+          [ 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
@@ -963,7 +965,7 @@ view string [ class ] {
               allow\-update { address_match_element; ... };
               allow\-update\-forwarding { address_match_element; ... };
               also\-notify [ port integer ] [ dscp integer ] { (
-                  primaries | ipv4_address [ port integer ] |
+                  remote\-servers | ipv4_address [ port integer ] |
                   ipv6_address [ port integer ] ) [ key string ] [
                   tls string ]; ... };
               alt\-transfer\-source ( ipv4_address | * ) [ port (
@@ -1004,7 +1006,7 @@ view string [ class ] {
               masterfile\-format ( map | raw | text );
               masterfile\-style ( full | relative );
               masters [ port integer ] [ dscp integer ] { (
-                  primaries | ipv4_address [ port integer ] |
+                  remote\-servers | ipv4_address [ port integer ] |
                   ipv6_address [ port integer ] ) [ key string ] [
                   tls string ]; ... };
               max\-ixfr\-ratio ( unlimited | percentage );
@@ -1028,7 +1030,7 @@ view string [ class ] {
                   | * ) ] [ dscp integer ];
               notify\-to\-soa boolean;
               primaries [ port integer ] [ dscp integer ] { (
-                  primaries | ipv4_address [ port integer ] |
+                  remote\-servers | ipv4_address [ port integer ] |
                   ipv6_address [ port integer ] ) [ key string ] [
                   tls string ]; ... };
               request\-expire boolean;
@@ -1077,9 +1079,10 @@ zone string [ class ] {
       allow\-transfer { address_match_element; ... };
       allow\-update { address_match_element; ... };
       allow\-update\-forwarding { address_match_element; ... };
-      also\-notify [ port integer ] [ dscp integer ] { ( primaries |
-          ipv4_address [ port integer ] | ipv6_address [ port
-          integer ] ) [ key string ] [ tls string ]; ... };
+      also\-notify [ port integer ] [ dscp integer ] { (
+          remote\-servers | ipv4_address [ port integer ] |
+          ipv6_address [ port integer ] ) [ key string ] [ tls
+          string ]; ... };
       alt\-transfer\-source ( ipv4_address | * ) [ port ( integer | * )
           ] [ dscp integer ];
       alt\-transfer\-source\-v6 ( ipv6_address | * ) [ port ( integer |
@@ -1115,8 +1118,8 @@ zone string [ class ] {
       key\-directory quoted_string;
       masterfile\-format ( map | raw | text );
       masterfile\-style ( full | relative );
-      masters [ port integer ] [ dscp integer ] { ( primaries |
-          ipv4_address [ port integer ] | ipv6_address [ port
+      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 );
@@ -1138,9 +1141,10 @@ zone string [ class ] {
       notify\-source\-v6 ( ipv6_address | * ) [ port ( integer | * ) ]
           [ dscp integer ];
       notify\-to\-soa boolean;
-      primaries [ port integer ] [ dscp integer ] { ( primaries |
-          ipv4_address [ port integer ] | ipv6_address [ port
-          integer ] ) [ key string ] [ tls string ]; ... };
+      primaries [ port integer ] [ dscp integer ] { (
+          remote\-servers | ipv4_address [ port integer ] |
+          ipv6_address [ port integer ] ) [ key string ] [ tls
+          string ]; ... };
       request\-expire boolean;
       request\-ixfr boolean;
       serial\-update\-method ( date | increment | unixtime );

diff --git a/doc/misc/master.zoneopt b/doc/misc/master.zoneopt
index ae47d96b85451b8023c1c980fb503e3bbd742f6d..45b905c545404864c563107a8b99c0ada4da403c 100644 (file)
--- a/doc/misc/master.zoneopt
+++ b/doc/misc/master.zoneopt
@@ -4,7 +4,7 @@ zone <string> [ <class> ] {
        allow-query-on { <address_match_element>; ... };
        allow-transfer { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        auto-dnssec ( allow | maintain | off );

diff --git a/doc/misc/master.zoneopt.rst b/doc/misc/master.zoneopt.rst
index 9bac436947ad724790ef896d6acf8aad28e92a46..968e4b24b1186c92b63bee050e78d1f630eb6ec4 100644 (file)
--- a/doc/misc/master.zoneopt.rst
+++ b/doc/misc/master.zoneopt.rst
@@ -6,7 +6,7 @@
        allow-query-on { <address_match_element>; ... };
        allow-transfer { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        auto-dnssec ( allow | maintain | off );

diff --git a/doc/misc/mirror.zoneopt b/doc/misc/mirror.zoneopt
index fee1789fe07733e9d19427366473e3c4e68f4006..fd72417fc0b55a861e265678b5a8cfd11eb7bea5 100644 (file)
--- a/doc/misc/mirror.zoneopt
+++ b/doc/misc/mirror.zoneopt
@@ -5,7 +5,7 @@ zone <string> [ <class> ] {
        allow-query-on { <address_match_element>; ... };
        allow-transfer { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        check-names ( fail | warn | ignore );
@@ -15,7 +15,7 @@ zone <string> [ <class> ] {
        journal <quoted_string>;
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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>;
@@ -32,7 +32,7 @@ zone <string> [ <class> ] {
        notify-delay <integer>;
        notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request-expire <boolean>;
        request-ixfr <boolean>;
        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];

diff --git a/doc/misc/mirror.zoneopt.rst b/doc/misc/mirror.zoneopt.rst
index ed63137f8e812353b8bd318cbf284db831c29e7f..efd335c0d413eb00027c915eab8f3c27c2e77b32 100644 (file)
--- a/doc/misc/mirror.zoneopt.rst
+++ b/doc/misc/mirror.zoneopt.rst
@@ -7,7 +7,7 @@
        allow-query-on { <address_match_element>; ... };
        allow-transfer { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        check-names ( fail | warn | ignore );
@@ -17,7 +17,7 @@
        journal <quoted_string>;
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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>;
@@ -34,7 +34,7 @@
        notify-delay <integer>;
        notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request-expire <boolean>;
        request-ixfr <boolean>;
        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];

diff --git a/doc/misc/options b/doc/misc/options
index e42b004c9e85a61ad76da4f7dd5cbf8c50b96357..e33917a6dc2dc8bec5cad9f08a9f59f2a3e3f47e 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -74,10 +74,10 @@ managed-keys { <string> ( static-key
     <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
 
 masters <string> [ port <integer> ] [ dscp
-    <integer> ] { ( <primaries> | <ipv4_address>
-    [ port <integer> ] | <ipv6_address> [ port
-    <integer> ] ) [ key <string> ] [ tls
-    <string> ]; ... }; // may occur multiple times
+    <integer> ] { ( <remote-servers> |
+    <ipv4_address> [ port <integer> ] |
+    <ipv6_address> [ port <integer> ] ) [ key
+    <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 options {
         allow-new-zones <boolean>;
@@ -91,9 +91,10 @@ options {
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
-        also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        also-notify [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
             ] [ dscp <integer> ];
         alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
@@ -109,7 +110,7 @@ options {
         blackhole { <address_match_element>; ... };
         cache-file <quoted_string>;
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port
+            [ 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
@@ -394,10 +395,10 @@ plugin ( query ) <string> [ { <unspecified-text>
     } ]; // may occur multiple times
 
 primaries <string> [ port <integer> ] [ dscp
-    <integer> ] { ( <primaries> | <ipv4_address>
-    [ port <integer> ] | <ipv6_address> [ port
-    <integer> ] ) [ key <string> ] [ tls
-    <string> ]; ... }; // may occur multiple times
+    <integer> ] { ( <remote-servers> |
+    <ipv4_address> [ port <integer> ] |
+    <ipv6_address> [ port <integer> ] ) [ key
+    <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 server <netprefix> {
         bogus <boolean>;
@@ -470,9 +471,10 @@ view <string> [ <class> ] {
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
-        also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        also-notify [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
             ] [ dscp <integer> ];
         alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
@@ -482,7 +484,7 @@ view <string> [ <class> ] {
         auto-dnssec ( allow | maintain | off );
         cache-file <quoted_string>;
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port
+            [ 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
@@ -750,7 +752,7 @@ view <string> [ <class> ] {
                 allow-update { <address_match_element>; ... };
                 allow-update-forwarding { <address_match_element>; ... };
                 also-notify [ port <integer> ] [ dscp <integer> ] { (
-                    <primaries> | <ipv4_address> [ port <integer> ] |
+                    <remote-servers> | <ipv4_address> [ port <integer> ] |
                     <ipv6_address> [ port <integer> ] ) [ key <string> ] [
                     tls <string> ]; ... };
                 alt-transfer-source ( <ipv4_address> | * ) [ port (
@@ -791,7 +793,7 @@ view <string> [ <class> ] {
                 masterfile-format ( map | raw | text );
                 masterfile-style ( full | relative );
                 masters [ port <integer> ] [ dscp <integer> ] { (
-                    <primaries> | <ipv4_address> [ port <integer> ] |
+                    <remote-servers> | <ipv4_address> [ port <integer> ] |
                     <ipv6_address> [ port <integer> ] ) [ key <string> ] [
                     tls <string> ]; ... };
                 max-ixfr-ratio ( unlimited | <percentage> );
@@ -816,7 +818,7 @@ view <string> [ <class> ] {
                 notify-to-soa <boolean>;
                 nsec3-test-zone <boolean>; // test only
                 primaries [ port <integer> ] [ dscp <integer> ] { (
-                    <primaries> | <ipv4_address> [ port <integer> ] |
+                    <remote-servers> | <ipv4_address> [ port <integer> ] |
                     <ipv6_address> [ port <integer> ] ) [ key <string> ] [
                     tls <string> ]; ... };
                 request-expire <boolean>;
@@ -856,9 +858,10 @@ zone <string> [ <class> ] {
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
-        also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        also-notify [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
             ] [ dscp <integer> ];
         alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
@@ -894,8 +897,8 @@ zone <string> [ <class> ] {
         key-directory <quoted_string>;
         masterfile-format ( map | raw | text );
         masterfile-style ( full | relative );
-        masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
+        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> );
@@ -918,9 +921,10 @@ zone <string> [ <class> ] {
             [ dscp <integer> ];
         notify-to-soa <boolean>;
         nsec3-test-zone <boolean>; // test only
-        primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        primaries [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         request-expire <boolean>;
         request-ixfr <boolean>;
         serial-update-method ( date | increment | unixtime );

diff --git a/doc/misc/options.active b/doc/misc/options.active
index d5adf85a98b05eba21404ff564e7dd5d1a8656c9..49fd35e230ef2b97f03379497a9e66b052f8dc44 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -73,10 +73,10 @@ managed-keys { <string> ( static-key
     <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
 
 masters <string> [ port <integer> ] [ dscp
-    <integer> ] { ( <primaries> | <ipv4_address>
-    [ port <integer> ] | <ipv6_address> [ port
-    <integer> ] ) [ key <string> ] [ tls
-    <string> ]; ... }; // may occur multiple times
+    <integer> ] { ( <remote-servers> |
+    <ipv4_address> [ port <integer> ] |
+    <ipv6_address> [ port <integer> ] ) [ key
+    <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 options {
         allow-new-zones <boolean>;
@@ -90,9 +90,10 @@ options {
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
-        also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        also-notify [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
             ] [ dscp <integer> ];
         alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
@@ -108,7 +109,7 @@ options {
         blackhole { <address_match_element>; ... };
         cache-file <quoted_string>;
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port
+            [ 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
@@ -391,10 +392,10 @@ plugin ( query ) <string> [ { <unspecified-text>
     } ]; // may occur multiple times
 
 primaries <string> [ port <integer> ] [ dscp
-    <integer> ] { ( <primaries> | <ipv4_address>
-    [ port <integer> ] | <ipv6_address> [ port
-    <integer> ] ) [ key <string> ] [ tls
-    <string> ]; ... }; // may occur multiple times
+    <integer> ] { ( <remote-servers> |
+    <ipv4_address> [ port <integer> ] |
+    <ipv6_address> [ port <integer> ] ) [ key
+    <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 server <netprefix> {
         bogus <boolean>;
@@ -467,9 +468,10 @@ view <string> [ <class> ] {
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
-        also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        also-notify [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
             ] [ dscp <integer> ];
         alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
@@ -479,7 +481,7 @@ view <string> [ <class> ] {
         auto-dnssec ( allow | maintain | off );
         cache-file <quoted_string>;
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
-            [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port
+            [ 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
@@ -745,7 +747,7 @@ view <string> [ <class> ] {
                 allow-update { <address_match_element>; ... };
                 allow-update-forwarding { <address_match_element>; ... };
                 also-notify [ port <integer> ] [ dscp <integer> ] { (
-                    <primaries> | <ipv4_address> [ port <integer> ] |
+                    <remote-servers> | <ipv4_address> [ port <integer> ] |
                     <ipv6_address> [ port <integer> ] ) [ key <string> ] [
                     tls <string> ]; ... };
                 alt-transfer-source ( <ipv4_address> | * ) [ port (
@@ -786,7 +788,7 @@ view <string> [ <class> ] {
                 masterfile-format ( map | raw | text );
                 masterfile-style ( full | relative );
                 masters [ port <integer> ] [ dscp <integer> ] { (
-                    <primaries> | <ipv4_address> [ port <integer> ] |
+                    <remote-servers> | <ipv4_address> [ port <integer> ] |
                     <ipv6_address> [ port <integer> ] ) [ key <string> ] [
                     tls <string> ]; ... };
                 max-ixfr-ratio ( unlimited | <percentage> );
@@ -810,7 +812,7 @@ view <string> [ <class> ] {
                     | * ) ] [ dscp <integer> ];
                 notify-to-soa <boolean>;
                 primaries [ port <integer> ] [ dscp <integer> ] { (
-                    <primaries> | <ipv4_address> [ port <integer> ] |
+                    <remote-servers> | <ipv4_address> [ port <integer> ] |
                     <ipv6_address> [ port <integer> ] ) [ key <string> ] [
                     tls <string> ]; ... };
                 request-expire <boolean>;
@@ -850,9 +852,10 @@ zone <string> [ <class> ] {
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
-        also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        also-notify [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
             ] [ dscp <integer> ];
         alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
@@ -888,8 +891,8 @@ zone <string> [ <class> ] {
         key-directory <quoted_string>;
         masterfile-format ( map | raw | text );
         masterfile-style ( full | relative );
-        masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
+        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> );
@@ -911,9 +914,10 @@ zone <string> [ <class> ] {
         notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ]
             [ dscp <integer> ];
         notify-to-soa <boolean>;
-        primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-            <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-            <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+        primaries [ port <integer> ] [ dscp <integer> ] { (
+            <remote-servers> | <ipv4_address> [ port <integer> ] |
+            <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+            <string> ]; ... };
         request-expire <boolean>;
         request-ixfr <boolean>;
         serial-update-method ( date | increment | unixtime );

diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
index 9ee853c6a912973e5aa447a5e0a83df3041f7eb8..fa2bac716084d4e5b2110d12d4d0b976f93f0a73 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -12,9 +12,10 @@
        allow-transfer { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> |
-           <ipv4_address> [ port <integer> ] | <ipv6_address> [ port
-           <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ] [ dscp <integer> ] { (
+           <remote-servers> | <ipv4_address> [ port <integer> ] |
+           <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls
+           <string> ]; ... };
        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
            ] [ dscp <integer> ];
        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
@@ -30,7 +31,7 @@
        blackhole { <address_match_element>; ... };
        cache-file <quoted_string>;
        catalog-zones { zone <string> [ default-masters [ port <integer> ]
-           [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port
+           [ 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

diff --git a/doc/misc/primaries.grammar.rst b/doc/misc/primaries.grammar.rst
index cfc7601724659961b0670406204974dc46dd9772..53f2e36daa8722abba910b334b5fbef5af2728fa 100644 (file)
--- a/doc/misc/primaries.grammar.rst
+++ b/doc/misc/primaries.grammar.rst
@@ -1,7 +1,7 @@
 ::
 
   primaries <string> [ port <integer> ] [ dscp
-      <integer> ] { ( <primaries> | <ipv4_address>
-      [ port <integer> ] | <ipv6_address> [ port
-      <integer> ] ) [ key <string> ] [ tls
-      <string> ]; ... };
+      <integer> ] { ( <remote-servers> |
+      <ipv4_address> [ port <integer> ] |
+      <ipv6_address> [ port <integer> ] ) [ key
+      <string> ] [ tls <string> ]; ... };

diff --git a/doc/misc/redirect.zoneopt b/doc/misc/redirect.zoneopt
index ac53d5499ca1104656fd5b09494cc25e6ff9433e..1a48cbc2c7fb962cf4290e467d4b53d7d2522709 100644 (file)
--- a/doc/misc/redirect.zoneopt
+++ b/doc/misc/redirect.zoneopt
@@ -6,9 +6,9 @@ zone <string> [ <class> ] {
        file <quoted_string>;
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/doc/misc/redirect.zoneopt.rst b/doc/misc/redirect.zoneopt.rst
index bf263cd00d8bacfd4246c18e0568c166b17de960..5b754bfd0cc055998671491aa42b34bd92fc01de 100644 (file)
--- a/doc/misc/redirect.zoneopt.rst
+++ b/doc/misc/redirect.zoneopt.rst
@@ -8,9 +8,9 @@
        file <quoted_string>;
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        zone-statistics ( full | terse | none | <boolean> );
   };

diff --git a/doc/misc/slave.zoneopt b/doc/misc/slave.zoneopt
index 169ed8481072e15b524860c450aebfd6c68c63db..490bb4637e19639fb78cae7c15c6ee4e3dce1513 100644 (file)
--- a/doc/misc/slave.zoneopt
+++ b/doc/misc/slave.zoneopt
@@ -5,7 +5,7 @@ zone <string> [ <class> ] {
        allow-query-on { <address_match_element>; ... };
        allow-transfer { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        auto-dnssec ( allow | maintain | off );
@@ -27,7 +27,7 @@ zone <string> [ <class> ] {
        key-directory <quoted_string>;
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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>;
@@ -45,7 +45,7 @@ zone <string> [ <class> ] {
        notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        notify-to-soa <boolean>;
-       primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request-expire <boolean>;
        request-ixfr <boolean>;
        sig-signing-nodes <integer>;

diff --git a/doc/misc/slave.zoneopt.rst b/doc/misc/slave.zoneopt.rst
index 6f2da9559d5a67dd474adad7b7ae951351932af5..d15501b7b57879649953f31ceee4eeff611af1a8 100644 (file)
--- a/doc/misc/slave.zoneopt.rst
+++ b/doc/misc/slave.zoneopt.rst
@@ -7,7 +7,7 @@
        allow-query-on { <address_match_element>; ... };
        allow-transfer { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        auto-dnssec ( allow | maintain | off );
@@ -29,7 +29,7 @@
        key-directory <quoted_string>;
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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>;
@@ -47,7 +47,7 @@
        notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        notify-to-soa <boolean>;
-       primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request-expire <boolean>;
        request-ixfr <boolean>;
        sig-signing-nodes <integer>;

diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt
index c616cc687f3a33cd3a78102bf0c46e0f3e013c07..0e37a789a4d6fafb420f9dbdf523a7da43e947b6 100644 (file)
--- a/doc/misc/stub.zoneopt
+++ b/doc/misc/stub.zoneopt
@@ -11,7 +11,7 @@ zone <string> [ <class> ] {
        forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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>;
@@ -20,7 +20,7 @@ zone <string> [ <class> ] {
        min-refresh-time <integer>;
        min-retry-time <integer>;
        multi-master <boolean>;
-       primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        use-alt-transfer-source <boolean>;

diff --git a/doc/misc/stub.zoneopt.rst b/doc/misc/stub.zoneopt.rst
index d00a0c17852779c95477074c308df67658c805c1..1db900a76b419fb792dd6d0cae7eb9beaf457487 100644 (file)
--- a/doc/misc/stub.zoneopt.rst
+++ b/doc/misc/stub.zoneopt.rst
@@ -13,7 +13,7 @@
        forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
        masterfile-format ( map | raw | text );
        masterfile-style ( full | relative );
-       masters [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       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>;
@@ -22,7 +22,7 @@
        min-refresh-time <integer>;
        min-retry-time <integer>;
        multi-master <boolean>;
-       primaries [ port <integer> ] [ dscp <integer> ] { ( <primaries> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ] [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        use-alt-transfer-source <boolean>;

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 02ed0f41209ec2eb8535c5bc8a8819e61fa7e36f..e19d5dc21c1ee0ae5a46c17107289d45d2498f68 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1999,7 +1999,7 @@ resume:
                const cfg_obj_t *key;
 
                addr = cfg_tuple_get(cfg_listelt_value(element),
-                                    "primarieselement");
+                                    "remoteselement");
                key = cfg_tuple_get(cfg_listelt_value(element), "key");
 
                if (cfg_obj_issockaddr(addr)) {

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index cf2b67deb7f38e224e04b2db55ccc31dc8ca2dd9..a512e9a2cc92b6ec2cf6d39888aaa487d55971ca 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -109,7 +109,7 @@ static cfg_type_t cfg_type_logging;
 static cfg_type_t cfg_type_logseverity;
 static cfg_type_t cfg_type_logsuffix;
 static cfg_type_t cfg_type_logversions;
-static cfg_type_t cfg_type_primarieselement;
+static cfg_type_t cfg_type_remoteselement;
 static cfg_type_t cfg_type_maxduration;
 static cfg_type_t cfg_type_minimal;
 static cfg_type_t cfg_type_nameportiplist;
@@ -191,8 +191,8 @@ static cfg_type_t cfg_type_acl = { "acl",       cfg_parse_tuple,
                                   cfg_print_tuple, cfg_doc_tuple,
                                   &cfg_rep_tuple,  acl_fields };
 
-/*% primaries */
-static cfg_tuplefielddef_t primaries_fields[] = {
+/*% remote servers, used for primaries and parental agents */
+static cfg_tuplefielddef_t remotes_fields[] = {
        { "name", &cfg_type_astring, 0 },
        { "port", &cfg_type_optional_port, 0 },
        { "dscp", &cfg_type_optional_dscp, 0 },
@@ -200,19 +200,19 @@ static cfg_tuplefielddef_t primaries_fields[] = {
        { NULL, NULL, 0 }
 };
 
-static cfg_type_t cfg_type_primaries = { "primaries",    cfg_parse_tuple,
-                                        cfg_print_tuple, cfg_doc_tuple,
-                                        &cfg_rep_tuple,  primaries_fields };
+static cfg_type_t cfg_type_remoteservers = { "remote-servers", cfg_parse_tuple,
+                                            cfg_print_tuple,  cfg_doc_tuple,
+                                            &cfg_rep_tuple,   remotes_fields };
 
 /*%
  * "sockaddrkeylist", a list of socket addresses with optional keys
- * and an optional default port, as used in the primaries option.
+ * and an optional default port, as used in the remote-servers option.
  * E.g.,
- *   "port 1234 { myprimaries; 10.0.0.1 key foo; 1::2 port 69; }"
+ *   "port 1234 { myservers; 10.0.0.1 key foo; 1::2 port 69; }"
  */
 
 static cfg_tuplefielddef_t namesockaddrkey_fields[] = {
-       { "primarieselement", &cfg_type_primarieselement, 0 },
+       { "remoteselement", &cfg_type_remoteselement, 0 },
        { "key", &cfg_type_optional_keyref, 0 },
        { "tls", &cfg_type_optional_tls, 0 },
        { NULL, NULL, 0 },
@@ -1112,9 +1112,9 @@ static cfg_clausedef_t namedconf_clauses[] = {
        { "http", &cfg_type_http_description, CFG_CLAUSEFLAG_MULTI },
        { "logging", &cfg_type_logging, 0 },
        { "lwres", NULL, CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_ANCIENT },
-       { "masters", &cfg_type_primaries, CFG_CLAUSEFLAG_MULTI },
+       { "masters", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI },
        { "options", &cfg_type_options, 0 },
-       { "primaries", &cfg_type_primaries, CFG_CLAUSEFLAG_MULTI },
+       { "primaries", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI },
        { "statistics-channels", &cfg_type_statschannels,
          CFG_CLAUSEFLAG_MULTI },
        { "tls", &cfg_type_tlsconf, CFG_CLAUSEFLAG_MULTI },
@@ -3668,14 +3668,14 @@ static cfg_type_t cfg_type_nameportiplist = {
 };
 
 /*%
- * primaries element.
+ * remote servers element.
  */
 
 static void
-doc_primarieselement(cfg_printer_t *pctx, const cfg_type_t *type) {
+doc_remoteselement(cfg_printer_t *pctx, const cfg_type_t *type) {
        UNUSED(type);
        cfg_print_cstr(pctx, "( ");
-       cfg_print_cstr(pctx, "<primaries>");
+       cfg_print_cstr(pctx, "<remote-servers>");
        cfg_print_cstr(pctx, " | ");
        cfg_print_cstr(pctx, "<ipv4_address>");
        cfg_print_cstr(pctx, " ");
@@ -3688,8 +3688,8 @@ doc_primarieselement(cfg_printer_t *pctx, const cfg_type_t *type) {
 }
 
 static isc_result_t
-parse_primarieselement(cfg_parser_t *pctx, const cfg_type_t *type,
-                      cfg_obj_t **ret) {
+parse_remoteselement(cfg_parser_t *pctx, const cfg_type_t *type,
+                    cfg_obj_t **ret) {
        isc_result_t result;
        cfg_obj_t *obj = NULL;
        UNUSED(type);
@@ -3707,7 +3707,8 @@ parse_primarieselement(cfg_parser_t *pctx, const cfg_type_t *type,
                }
        } else {
                cfg_parser_error(pctx, CFG_LOG_NEAR,
-                                "expected IP address or primaries list name");
+                                "expected IP address or remote servers list "
+                                "name");
                return (ISC_R_UNEXPECTEDTOKEN);
        }
 cleanup:
@@ -3715,12 +3716,12 @@ cleanup:
        return (result);
 }
 
-static cfg_type_t cfg_type_primarieselement = { "primaries_element",
-                                               parse_primarieselement,
-                                               NULL,
-                                               doc_primarieselement,
-                                               NULL,
-                                               NULL };
+static cfg_type_t cfg_type_remoteselement = { "remotes_element",
+                                             parse_remoteselement,
+                                             NULL,
+                                             doc_remoteselement,
+                                             NULL,
+                                             NULL };
 
 static int
 cmp_clause(const void *ap, const void *bp) {