Remove setting alternate transfer source from doc

Remove any reference to 'alt-transfer-source', 'alt-transfer-source-v6',
and 'use-alt-transfer-source' from the documentation and manual pages.

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index a5afb61dbe256eab096f466ce75555166b0a0e10..a046f58ad0b45ef93335aba537ec5b0a1b8feab4 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -891,8 +891,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
        int i;
        int32_t journal_size;
        bool multi;
-       bool alt;
-       dns_view_t *view = NULL;
        dns_kasp_t *kasp = NULL;
        bool check = false, fail = false;
        bool warn = false, ignore = false;

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index de69a4c0b6278755002ed1f481467a0a02d8135c..a13d1fd94b474bbfda738efcc3828db2faf469fe 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -3576,32 +3576,6 @@ options apply to zone transfers.
    This option is the same as :any:`transfer-source`, except zone transfers are performed
    using IPv6.
 
-.. namedconf:statement:: alt-transfer-source
-   :tags: deprecated
-   :short: Defines alternate local IPv4 address(es) to be used by the server for inbound zone transfers, if the address(es) defined by :any:`transfer-source` fail and :any:`use-alt-transfer-source` is enabled.
-
-   This indicates an alternate transfer source if the one listed in :any:`transfer-source`
-   fails and :any:`use-alt-transfer-source` is set.
-
-   .. note:: To avoid using the alternate transfer source,
-      set :any:`use-alt-transfer-source` appropriately and
-      do not depend upon getting an answer back to the first refresh
-      query.
-
-.. namedconf:statement:: alt-transfer-source-v6
-   :tags: deprecated
-   :short: Defines alternate local IPv6 address(es) to be used by the server for inbound zone transfers.
-
-   This indicates an alternate transfer source if the one listed in
-   :any:`transfer-source-v6` fails and :any:`use-alt-transfer-source` is set.
-
-.. namedconf:statement:: use-alt-transfer-source
-   :tags: deprecated
-   :short: Indicates whether :any:`alt-transfer-source` and :any:`alt-transfer-source-v6` can be used.
-
-   This indicates whether the alternate transfer sources should be used. If views are specified,
-   this defaults to ``no``; otherwise, it defaults to ``yes``.
-
 .. namedconf:statement:: notify-source
    :tags: transfer
    :short: Defines the IPv4 address (and optional port) to be used for outgoing ``NOTIFY`` messages.
@@ -7192,15 +7166,6 @@ Zone Options
 :any:`transfer-source-v6`
    See the description of :any:`transfer-source-v6` in :ref:`zone_transfers`.
 
-:any:`alt-transfer-source`
-   See the description of :any:`alt-transfer-source` in :ref:`zone_transfers`.
-
-:any:`alt-transfer-source-v6`
-   See the description of :any:`alt-transfer-source-v6` in :ref:`zone_transfers`.
-
-:any:`use-alt-transfer-source`
-   See the description of :any:`use-alt-transfer-source` in :ref:`zone_transfers`.
-
 :any:`notify-source`
    See the description of :any:`notify-source` in :ref:`zone_transfers`.
 

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index a1fbfa5d3b8534245fcc28b01aed27084825a88c..4abf55f31fcd06e9d89f5d29e8e69ed0d515aecc 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -127,8 +127,6 @@ options {
        allow\-update { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt\-transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        answer\-cookie <boolean>;
        attach\-cache <string>;
        auth\-nxdomain <boolean>;
@@ -362,7 +360,6 @@ options {
        udp\-receive\-buffer <integer>;
        udp\-send\-buffer <integer>;
        update\-check\-ksk <boolean>;
-       use\-alt\-transfer\-source <boolean>; // deprecated
        use\-v4\-udp\-ports { <portrange>; ... };
        use\-v6\-udp\-ports { <portrange>; ... };
        v6\-bias <integer>;
@@ -438,8 +435,6 @@ view <string> [ <class> ] {
        allow\-update { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt\-transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        attach\-cache <string>;
        auth\-nxdomain <boolean>;
        auto\-dnssec ( allow | maintain | off ); // deprecated
@@ -640,7 +635,6 @@ view <string> [ <class> ] {
        trusted\-keys { <string> <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
        try\-tcp\-refresh <boolean>;
        update\-check\-ksk <boolean>;
-       use\-alt\-transfer\-source <boolean>; // deprecated
        v6\-bias <integer>;
        validate\-except { <string>; ... };
        zero\-no\-soa\-ttl <boolean>;
@@ -667,8 +661,6 @@ zone <string> [ <class> ] {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update { <address_match_element>; ... };
        also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt\-transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        auto\-dnssec ( allow | maintain | off ); // deprecated
        check\-dup\-records ( fail | warn | ignore );
        check\-integrity <boolean>;
@@ -741,8 +733,6 @@ zone <string> [ <class> ] {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt\-transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        auto\-dnssec ( allow | maintain | off ); // deprecated
        check\-names ( fail | warn | ignore );
        database <string>;
@@ -794,7 +784,6 @@ zone <string> [ <class> ] {
        transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        try\-tcp\-refresh <boolean>;
        update\-check\-ksk <boolean>;
-       use\-alt\-transfer\-source <boolean>; // deprecated
        zero\-no\-soa\-ttl <boolean>;
        zone\-statistics ( full | terse | none | <boolean> );
 };
@@ -816,8 +805,6 @@ zone <string> [ <class> ] {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt\-transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        check\-names ( fail | warn | ignore );
        database <string>;
        file <quoted_string>;
@@ -847,7 +834,6 @@ zone <string> [ <class> ] {
        transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        try\-tcp\-refresh <boolean>;
-       use\-alt\-transfer\-source <boolean>; // deprecated
        zero\-no\-soa\-ttl <boolean>;
        zone\-statistics ( full | terse | none | <boolean> );
 };
@@ -961,7 +947,6 @@ zone <string> [ <class> ] {
        primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ 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>; // deprecated
        zone\-statistics ( full | terse | none | <boolean> );
 };
 

diff --git a/doc/misc/mirror.zoneopt b/doc/misc/mirror.zoneopt
index 959a7331930c91f8d7c81639a591ed4fbe43697a..a0aeb46e8ef942549bdb8cbe0f865b5644f44d05 100644 (file)
--- a/doc/misc/mirror.zoneopt
+++ b/doc/misc/mirror.zoneopt
@@ -6,8 +6,6 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        check-names ( fail | warn | ignore );
        database <string>;
        file <quoted_string>;
@@ -37,7 +35,6 @@ zone <string> [ <class> ] {
        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        try-tcp-refresh <boolean>;
-       use-alt-transfer-source <boolean>; // deprecated
        zero-no-soa-ttl <boolean>;
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/doc/misc/options b/doc/misc/options
index ea1f7d770f9c6c0f584c8b750e5651a9abd51c89..fb970713f37ca91c2c5ca713d10c712e89ac818a 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -70,8 +70,6 @@ options {
        allow-update { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        answer-cookie <boolean>;
        attach-cache <string>;
        auth-nxdomain <boolean>;
@@ -305,7 +303,6 @@ options {
        udp-receive-buffer <integer>;
        udp-send-buffer <integer>;
        update-check-ksk <boolean>;
-       use-alt-transfer-source <boolean>; // deprecated
        use-v4-udp-ports { <portrange>; ... };
        use-v6-udp-ports { <portrange>; ... };
        v6-bias <integer>;
@@ -381,8 +378,6 @@ view <string> [ <class> ] {
        allow-update { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        attach-cache <string>;
        auth-nxdomain <boolean>;
        auto-dnssec ( allow | maintain | off ); // deprecated
@@ -583,7 +578,6 @@ view <string> [ <class> ] {
        trusted-keys { <string> <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
        try-tcp-refresh <boolean>;
        update-check-ksk <boolean>;
-       use-alt-transfer-source <boolean>; // deprecated
        v6-bias <integer>;
        validate-except { <string>; ... };
        zero-no-soa-ttl <boolean>;

diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt
index 75d1bccadf21c7cb3d8584a6e04598e1764ea6b9..5c78fc5b993d21a1ac0e0e4bc9b39752d24b5cb2 100644 (file)
--- a/doc/misc/primary.zoneopt
+++ b/doc/misc/primary.zoneopt
@@ -5,8 +5,6 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
        also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        auto-dnssec ( allow | maintain | off ); // deprecated
        check-dup-records ( fail | warn | ignore );
        check-integrity <boolean>;

diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt
index f20c5d1d0c9da27eadab91258993ae681f5593d6..7c265b37a528c423cabfa8bcdec4b873754b3ab7 100644 (file)
--- a/doc/misc/secondary.zoneopt
+++ b/doc/misc/secondary.zoneopt
@@ -6,8 +6,6 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ 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> ]; // deprecated
-       alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ]; // deprecated
        auto-dnssec ( allow | maintain | off ); // deprecated
        check-names ( fail | warn | ignore );
        database <string>;
@@ -59,7 +57,6 @@ zone <string> [ <class> ] {
        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
        try-tcp-refresh <boolean>;
        update-check-ksk <boolean>;
-       use-alt-transfer-source <boolean>; // deprecated
        zero-no-soa-ttl <boolean>;
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt
index 74e2c73317d368cd8317967100ff5c0a548ed423..31a1df3ab7b2d543bf04e15d39e126a7dd2ba322 100644 (file)
--- a/doc/misc/stub.zoneopt
+++ b/doc/misc/stub.zoneopt
@@ -22,6 +22,5 @@ zone <string> [ <class> ] {
        primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ 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>; // deprecated
        zone-statistics ( full | terse | none | <boolean> );
 };