Fix the configuration type used by the "server-addresses" option

Contrary to what the documentation states, the "server-addresses"
static-stub zone option does not accept custom port numbers.  Fix the
configuration type used by the "server-addresses" option to ensure
documentation matches source code.  Remove a check_zoneconf() test which
is unnecessary with this fix in place.

diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index dcea32d72e28a1ce26cd32d300e4ec02ebe0588d..61048326819a005e505f732a10c1a02b5f86577f 100644 (file)
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -899,8 +899,7 @@ view \fIstring\fR [ \fIclass\fR ] {
                request\-expire \fIboolean\fR;
                request\-ixfr \fIboolean\fR;
                serial\-update\-method ( date | increment | unixtime );
-               server\-addresses { ( \fIipv4_address\fR | \fIipv6_address\fR ) [
-                   port \fIinteger\fR ]; \&.\&.\&. };
+               server\-addresses { ( \fIipv4_address\fR | \fIipv6_address\fR ); \&.\&.\&. };
                server\-names { \fIstring\fR; \&.\&.\&. };
                sig\-signing\-nodes \fIinteger\fR;
                sig\-signing\-signatures \fIinteger\fR;
@@ -1007,8 +1006,7 @@ zone \fIstring\fR [ \fIclass\fR ] {
        request\-expire \fIboolean\fR;
        request\-ixfr \fIboolean\fR;
        serial\-update\-method ( date | increment | unixtime );
-       server\-addresses { ( \fIipv4_address\fR | \fIipv6_address\fR ) [ port
-           \fIinteger\fR ]; \&.\&.\&. };
+       server\-addresses { ( \fIipv4_address\fR | \fIipv6_address\fR ); \&.\&.\&. };
        server\-names { \fIstring\fR; \&.\&.\&. };
        sig\-signing\-nodes \fIinteger\fR;
        sig\-signing\-signatures \fIinteger\fR;

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 04fc8476a87b9c30b13244c6cd0db0d548c4a0a1..49aa2104f9b61dc3dd698e7410952e99461c1c96 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -13,7 +13,7 @@
 
 <refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf">
   <info>
-    <date>2018-09-04</date>
+    <date>2018-10-23</date>
   </info>
   <refentryinfo>
     <corpname>ISC</corpname>
@@ -879,8 +879,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
                request-expire <replaceable>boolean</replaceable>;
                request-ixfr <replaceable>boolean</replaceable>;
                serial-update-method ( date | increment | unixtime );
-               server-addresses { ( <replaceable>ipv4_address</replaceable> | <replaceable>ipv6_address</replaceable> ) [
-                   port <replaceable>integer</replaceable> ]; ... };
+               server-addresses { ( <replaceable>ipv4_address</replaceable> | <replaceable>ipv6_address</replaceable> ); ... };
                server-names { <replaceable>string</replaceable>; ... };
                sig-signing-nodes <replaceable>integer</replaceable>;
                sig-signing-signatures <replaceable>integer</replaceable>;
@@ -983,8 +982,7 @@ zone <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        request-expire <replaceable>boolean</replaceable>;
        request-ixfr <replaceable>boolean</replaceable>;
        serial-update-method ( date | increment | unixtime );
-       server-addresses { ( <replaceable>ipv4_address</replaceable> | <replaceable>ipv6_address</replaceable> ) [ port
-           <replaceable>integer</replaceable> ]; ... };
+       server-addresses { ( <replaceable>ipv4_address</replaceable> | <replaceable>ipv6_address</replaceable> ); ... };
        server-names { <replaceable>string</replaceable>; ... };
        sig-signing-nodes <replaceable>integer</replaceable>;
        sig-signing-signatures <replaceable>integer</replaceable>;

diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index 2e4bff72bcb614aafdc9fe198ec5e1a7ccff494a..7169f14cebdcb62297a0b17b571380d567cd8e11 100644 (file)
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -868,8 +868,7 @@ view
                request-expire <em class="replaceable"><code>boolean</code></em>;<br>
                request-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
                serial-update-method ( date | increment | unixtime );<br>
-               server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ) [<br>
-                   port <em class="replaceable"><code>integer</code></em> ]; ... };<br>
+               server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ); ... };<br>
                server-names { <em class="replaceable"><code>string</code></em>; ... };<br>
                sig-signing-nodes <em class="replaceable"><code>integer</code></em>;<br>
                sig-signing-signatures <em class="replaceable"><code>integer</code></em>;<br>
@@ -973,8 +972,7 @@ zone
        request-expire <em class="replaceable"><code>boolean</code></em>;<br>
        request-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
        serial-update-method ( date | increment | unixtime );<br>
-       server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ) [ port<br>
-           <em class="replaceable"><code>integer</code></em> ]; ... };<br>
+       server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ); ... };<br>
        server-names { <em class="replaceable"><code>string</code></em>; ... };<br>
        sig-signing-nodes <em class="replaceable"><code>integer</code></em>;<br>
        sig-signing-signatures <em class="replaceable"><code>integer</code></em>;<br>

diff --git a/doc/arm/Bv9ARM.ch05.html b/doc/arm/Bv9ARM.ch05.html
index 6c08c0a4940af6759d0ead371bba8e51762ed8a0..36939a6ea3c40c5fee7a67b92d75460eea71f978 100644 (file)
--- a/doc/arm/Bv9ARM.ch05.html
+++ b/doc/arm/Bv9ARM.ch05.html
@@ -9465,7 +9465,7 @@ view "external" {
        <span class="command"><strong>forward</strong></span> ( first | only );
        <span class="command"><strong>forwarders</strong></span> [ port <em class="replaceable"><code>integer</code></em> ] [ dscp <em class="replaceable"><code>integer</code></em> ] { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ) [ port <em class="replaceable"><code>integer</code></em> ] [ dscp <em class="replaceable"><code>integer</code></em> ]; ... };
        <span class="command"><strong>max-records</strong></span> <em class="replaceable"><code>integer</code></em>;
-       <span class="command"><strong>server-addresses</strong></span> { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ) [ port <em class="replaceable"><code>integer</code></em> ]; ... };
+       <span class="command"><strong>server-addresses</strong></span> { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ); ... };
        <span class="command"><strong>server-names</strong></span> { <em class="replaceable"><code>string</code></em>; ... };
        <span class="command"><strong>zone-statistics</strong></span> ( full | terse | none | <em class="replaceable"><code>boolean</code></em> );
 };

diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html
index 8dab2cff4fc5a81386a85efd9f981c4e79d69497..3c91638ea3b31171ef1711bf4d512bbd12202a25 100644 (file)
--- a/doc/arm/man.named.conf.html
+++ b/doc/arm/man.named.conf.html
@@ -886,8 +886,7 @@ view
                request-expire <em class="replaceable"><code>boolean</code></em>;<br>
                request-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
                serial-update-method ( date | increment | unixtime );<br>
-               server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ) [<br>
-                   port <em class="replaceable"><code>integer</code></em> ]; ... };<br>
+               server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ); ... };<br>
                server-names { <em class="replaceable"><code>string</code></em>; ... };<br>
                sig-signing-nodes <em class="replaceable"><code>integer</code></em>;<br>
                sig-signing-signatures <em class="replaceable"><code>integer</code></em>;<br>
@@ -991,8 +990,7 @@ zone
        request-expire <em class="replaceable"><code>boolean</code></em>;<br>
        request-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
        serial-update-method ( date | increment | unixtime );<br>
-       server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ) [ port<br>
-           <em class="replaceable"><code>integer</code></em> ]; ... };<br>
+       server-addresses { ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ); ... };<br>
        server-names { <em class="replaceable"><code>string</code></em>; ... };<br>
        sig-signing-nodes <em class="replaceable"><code>integer</code></em>;<br>
        sig-signing-signatures <em class="replaceable"><code>integer</code></em>;<br>

diff --git a/doc/arm/static-stub.zoneopt.xml b/doc/arm/static-stub.zoneopt.xml
index 4aadf68936721fd4ea2349b8c6f4555594e960de..beb1f1056229665f0224f3ca9de6730da00d4b01 100644 (file)
--- a/doc/arm/static-stub.zoneopt.xml
+++ b/doc/arm/static-stub.zoneopt.xml
@@ -18,7 +18,7 @@
        <command>forward</command> ( first | only );
        <command>forwarders</command> [ port <replaceable>integer</replaceable> ] [ dscp <replaceable>integer</replaceable> ] { ( <replaceable>ipv4_address</replaceable> | <replaceable>ipv6_address</replaceable> ) [ port <replaceable>integer</replaceable> ] [ dscp <replaceable>integer</replaceable> ]; ... };
        <command>max-records</command> <replaceable>integer</replaceable>;
-       <command>server-addresses</command> { ( <replaceable>ipv4_address</replaceable> | <replaceable>ipv6_address</replaceable> ) [ port <replaceable>integer</replaceable> ]; ... };
+       <command>server-addresses</command> { ( <replaceable>ipv4_address</replaceable> | <replaceable>ipv6_address</replaceable> ); ... };
        <command>server-names</command> { <replaceable>string</replaceable>; ... };
        <command>zone-statistics</command> ( full | terse | none | <replaceable>boolean</replaceable> );
 };

diff --git a/doc/misc/options b/doc/misc/options
index 546e5144d4cfc4dd69582897c4e6f521e3d6ba92..e845e3e52f104ff0785380da9b97d95cb889dea3 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -803,8 +803,7 @@ view <string> [ <class> ] {
                 request-expire <boolean>;
                 request-ixfr <boolean>;
                 serial-update-method ( date | increment | unixtime );
-                server-addresses { ( <ipv4_address> | <ipv6_address> ) [
-                    port <integer> ]; ... };
+                server-addresses { ( <ipv4_address> | <ipv6_address> ); ... };
                 server-names { <string>; ... };
                 sig-signing-nodes <integer>;
                 sig-signing-signatures <integer>;
@@ -908,8 +907,7 @@ zone <string> [ <class> ] {
         request-expire <boolean>;
         request-ixfr <boolean>;
         serial-update-method ( date | increment | unixtime );
-        server-addresses { ( <ipv4_address> | <ipv6_address> ) [ port
-            <integer> ]; ... };
+        server-addresses { ( <ipv4_address> | <ipv6_address> ); ... };
         server-names { <string>; ... };
         sig-signing-nodes <integer>;
         sig-signing-signatures <integer>;

diff --git a/doc/misc/static-stub.zoneopt b/doc/misc/static-stub.zoneopt
index 809daf38e7351f9cbb7b97897146627d85a67d17..f89d46248a43473e9a06b6d43d2500a54bc496b8 100644 (file)
--- a/doc/misc/static-stub.zoneopt
+++ b/doc/misc/static-stub.zoneopt
@@ -5,7 +5,7 @@ zone <string> [ <class> ] {
        forward ( first | only );
        forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
        max-records <integer>;
-       server-addresses { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
+       server-addresses { ( <ipv4_address> | <ipv6_address> ); ... };
        server-names { <string>; ... };
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 451bfbeeacdf9440fb2dd1a5621dc045ac80b6f0..40608518881eb4b272362f08c93a4bb6baabd7d2 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -2461,13 +2461,6 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
                        obj = cfg_listelt_value(element);
                        sa = *cfg_obj_assockaddr(obj);
 
-                       if (isc_sockaddr_getport(&sa) != 0) {
-                               result = ISC_R_FAILURE;
-                               cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-                                           "port is not configurable for "
-                                           "static stub server-addresses");
-                       }
-
                        isc_netaddr_fromsockaddr(&na, &sa);
                        if (isc_netaddr_getzone(&na) != 0) {
                                result = ISC_R_FAILURE;

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index d6881de77f10efd5a787d8bb4d6341b70553918e..3b51a080bab5b9a7933950e774fd16ea609531c0 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -98,7 +98,7 @@ static cfg_type_t cfg_type_addrmatchelt;
 static cfg_type_t cfg_type_bracketed_aml;
 static cfg_type_t cfg_type_bracketed_dscpsockaddrlist;
 static cfg_type_t cfg_type_bracketed_namesockaddrkeylist;
-static cfg_type_t cfg_type_bracketed_sockaddrlist;
+static cfg_type_t cfg_type_bracketed_netaddrlist;
 static cfg_type_t cfg_type_bracketed_sockaddrnameportlist;
 static cfg_type_t cfg_type_controls;
 static cfg_type_t cfg_type_controls_sockaddr;
@@ -566,10 +566,10 @@ static cfg_type_t cfg_type_bracketed_dscpsockaddrlist = {
        &cfg_type_sockaddrdscp
 };
 
-static cfg_type_t cfg_type_bracketed_sockaddrlist = {
-       "bracketed_sockaddrlist", cfg_parse_bracketed_list,
+static cfg_type_t cfg_type_bracketed_netaddrlist = {
+       "bracketed_netaddrlist", cfg_parse_bracketed_list,
        cfg_print_bracketed_list, cfg_doc_bracketed_list, &cfg_rep_list,
-       &cfg_type_sockaddr
+       &cfg_type_netaddr
 };
 
 static const char *autodnssec_enums[] = {
@@ -2281,7 +2281,7 @@ zone_only_clauses[] = {
        { "pubkey", &cfg_type_pubkey,
                CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_OBSOLETE
        },
-       { "server-addresses", &cfg_type_bracketed_sockaddrlist,
+       { "server-addresses", &cfg_type_bracketed_netaddrlist,
                CFG_ZONE_STATICSTUB
        },
        { "server-names", &cfg_type_namelist,