Deprecate alt-transfer-source and companions

Deprecate the alternate transfer sources from BIND 8.

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 419e1b8bc2d9730975c40c4feb1faad143c2505e..eec3cce193e11f869fa0a9d62b9e1fd36aafed86 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -3571,7 +3571,7 @@ options apply to zone transfers.
    using IPv6.
 
 .. namedconf:statement:: alt-transfer-source
-   :tags: transfer
+   :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`
@@ -3583,14 +3583,14 @@ options apply to zone transfers.
       query.
 
 .. namedconf:statement:: alt-transfer-source-v6
-   :tags: transfer
+   :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: transfer
+   :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,

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index 8cf7eb93ad40985cb58364c392d581b7252e30d8..dbd6e9d901ce4baff8282a1cea8e7126af17b187 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -127,8 +127,8 @@ options {
        allow\-update { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        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> ];
+       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>;
@@ -366,7 +366,7 @@ options {
        udp\-receive\-buffer <integer>;
        udp\-send\-buffer <integer>;
        update\-check\-ksk <boolean>;
-       use\-alt\-transfer\-source <boolean>;
+       use\-alt\-transfer\-source <boolean>; // deprecated
        use\-v4\-udp\-ports { <portrange>; ... };
        use\-v6\-udp\-ports { <portrange>; ... };
        v6\-bias <integer>;
@@ -442,8 +442,8 @@ view <string> [ <class> ] {
        allow\-update { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        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> ];
+       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
@@ -644,7 +644,7 @@ 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>;
+       use\-alt\-transfer\-source <boolean>; // deprecated
        v6\-bias <integer>;
        validate\-except { <string>; ... };
        zero\-no\-soa\-ttl <boolean>;
@@ -671,8 +671,8 @@ zone <string> [ <class> ] {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update { <address_match_element>; ... };
        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> ];
+       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>;
@@ -745,8 +745,8 @@ zone <string> [ <class> ] {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        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> ];
+       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>;
@@ -798,7 +798,7 @@ 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>;
+       use\-alt\-transfer\-source <boolean>; // deprecated
        zero\-no\-soa\-ttl <boolean>;
        zone\-statistics ( full | terse | none | <boolean> );
 };
@@ -820,8 +820,8 @@ zone <string> [ <class> ] {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
        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> ];
+       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>;
@@ -851,7 +851,7 @@ 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>;
+       use\-alt\-transfer\-source <boolean>; // deprecated
        zero\-no\-soa\-ttl <boolean>;
        zone\-statistics ( full | terse | none | <boolean> );
 };
@@ -965,7 +965,7 @@ zone <string> [ <class> ] {
        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>;
+       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 8b673c2409f61da721b337177acc118eceb24a78..90a0b97a59970452a09797c4bdb41f8b4b0abf0f 100644 (file)
--- a/doc/misc/mirror.zoneopt
+++ b/doc/misc/mirror.zoneopt
@@ -6,8 +6,8 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        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> ];
+       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 +37,7 @@ 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>;
+       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 7b427a5bd4d79e1a73fc1b97dbee9b59fc0cfb23..97462e7a2d4811b318f9f472a1c2a3e43580687f 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -70,8 +70,8 @@ options {
        allow-update { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        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> ];
+       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>;
@@ -309,7 +309,7 @@ options {
        udp-receive-buffer <integer>;
        udp-send-buffer <integer>;
        update-check-ksk <boolean>;
-       use-alt-transfer-source <boolean>;
+       use-alt-transfer-source <boolean>; // deprecated
        use-v4-udp-ports { <portrange>; ... };
        use-v6-udp-ports { <portrange>; ... };
        v6-bias <integer>;
@@ -385,8 +385,8 @@ view <string> [ <class> ] {
        allow-update { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        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> ];
+       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
@@ -587,7 +587,7 @@ 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>;
+       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 12034f3b057824b5396e35b59471c2623fe86757..78c329344232e1d99be0e7a26f368e4b19363d54 100644 (file)
--- a/doc/misc/primary.zoneopt
+++ b/doc/misc/primary.zoneopt
@@ -5,8 +5,8 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
        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> ];
+       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 dfeb63eee813c03462e90b7f0c3c9a936b9115ce..75c99e3973f9c7aaf489dea73f156b816ba03a16 100644 (file)
--- a/doc/misc/secondary.zoneopt
+++ b/doc/misc/secondary.zoneopt
@@ -6,8 +6,8 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        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> ];
+       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 +59,7 @@ 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>;
+       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 305585b9e0e834ae319527c584622d42c8d17273..d5b0ba51449674e922e3784b394172a3850fc1d5 100644 (file)
--- a/doc/misc/stub.zoneopt
+++ b/doc/misc/stub.zoneopt
@@ -22,6 +22,6 @@ zone <string> [ <class> ] {
        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>;
+       use-alt-transfer-source <boolean>; // deprecated
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 78c345de68914419e111b01fe6d94bfe3013c0ab..8336b1a58fb86c3700a8ceaea53821c1b8bdd948 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2243,9 +2243,11 @@ static cfg_clausedef_t zone_clauses[] = {
        { "also-notify", &cfg_type_namesockaddrkeylist,
          CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR },
        { "alt-transfer-source", &cfg_type_sockaddr4wild,
-         CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR },
+         CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR |
+                 CFG_CLAUSEFLAG_DEPRECATED },
        { "alt-transfer-source-v6", &cfg_type_sockaddr6wild,
-         CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR },
+         CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR |
+                 CFG_CLAUSEFLAG_DEPRECATED },
        { "auto-dnssec", &cfg_type_autodnssec,
          CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_CLAUSEFLAG_DEPRECATED },
        { "check-dup-records", &cfg_type_checkmode, CFG_ZONE_PRIMARY },
@@ -2352,7 +2354,8 @@ static cfg_clausedef_t zone_clauses[] = {
        { "update-check-ksk", &cfg_type_boolean,
          CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY },
        { "use-alt-transfer-source", &cfg_type_boolean,
-         CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR | CFG_ZONE_STUB },
+         CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR | CFG_ZONE_STUB |
+                 CFG_CLAUSEFLAG_DEPRECATED },
        { "zero-no-soa-ttl", &cfg_type_boolean,
          CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR },
        { "zone-statistics", &cfg_type_zonestat,