From: Matthijs Mekking Date: Mon, 5 Dec 2022 09:18:33 +0000 (+0100) Subject: Remove setting alternate transfer source from doc X-Git-Tag: v9.19.9~56^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8640e70616a189ba6300259fdad77b0f0a5c6b99;p=thirdparty%2Fbind9.git 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 a5afb61dbe2..a046f58ad0b 100644 --- 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 de69a4c0b62..a13d1fd94b4 100644 --- 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 a1fbfa5d3b8..4abf55f31fc 100644 --- a/doc/man/named.conf.5in +++ b/doc/man/named.conf.5in @@ -127,8 +127,6 @@ options { allow\-update { ; ... }; allow\-update\-forwarding { ; ... }; also\-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source\-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt\-transfer\-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt\-transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated answer\-cookie ; attach\-cache ; auth\-nxdomain ; @@ -362,7 +360,6 @@ options { udp\-receive\-buffer ; udp\-send\-buffer ; update\-check\-ksk ; - use\-alt\-transfer\-source ; // deprecated use\-v4\-udp\-ports { ; ... }; use\-v6\-udp\-ports { ; ... }; v6\-bias ; @@ -438,8 +435,6 @@ view [ ] { allow\-update { ; ... }; allow\-update\-forwarding { ; ... }; also\-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source\-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt\-transfer\-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt\-transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated attach\-cache ; auth\-nxdomain ; auto\-dnssec ( allow | maintain | off ); // deprecated @@ -640,7 +635,6 @@ view [ ] { trusted\-keys { ; ... }; // may occur multiple times, deprecated try\-tcp\-refresh ; update\-check\-ksk ; - use\-alt\-transfer\-source ; // deprecated v6\-bias ; validate\-except { ; ... }; zero\-no\-soa\-ttl ; @@ -667,8 +661,6 @@ zone [ ] { allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update { ; ... }; also\-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source\-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt\-transfer\-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt\-transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated auto\-dnssec ( allow | maintain | off ); // deprecated check\-dup\-records ( fail | warn | ignore ); check\-integrity ; @@ -741,8 +733,6 @@ zone [ ] { allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update\-forwarding { ; ... }; also\-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source\-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt\-transfer\-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt\-transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated auto\-dnssec ( allow | maintain | off ); // deprecated check\-names ( fail | warn | ignore ); database ; @@ -794,7 +784,6 @@ zone [ ] { transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; try\-tcp\-refresh ; update\-check\-ksk ; - use\-alt\-transfer\-source ; // deprecated zero\-no\-soa\-ttl ; zone\-statistics ( full | terse | none | ); }; @@ -816,8 +805,6 @@ zone [ ] { allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update\-forwarding { ; ... }; also\-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source\-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt\-transfer\-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt\-transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated check\-names ( fail | warn | ignore ); database ; file ; @@ -847,7 +834,6 @@ zone [ ] { transfer\-source ( | * ) [ port ( | * ) ] [ dscp ]; transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; try\-tcp\-refresh ; - use\-alt\-transfer\-source ; // deprecated zero\-no\-soa\-ttl ; zone\-statistics ( full | terse | none | ); }; @@ -961,7 +947,6 @@ zone [ ] { primaries [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source\-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; transfer\-source ( | * ) [ port ( | * ) ] [ dscp ]; transfer\-source\-v6 ( | * ) [ port ( | * ) ] [ dscp ]; - use\-alt\-transfer\-source ; // deprecated zone\-statistics ( full | terse | none | ); }; diff --git a/doc/misc/mirror.zoneopt b/doc/misc/mirror.zoneopt index 959a7331930..a0aeb46e8ef 100644 --- a/doc/misc/mirror.zoneopt +++ b/doc/misc/mirror.zoneopt @@ -6,8 +6,6 @@ zone [ ] { allow-transfer [ port ] [ transport ] { ; ... }; allow-update-forwarding { ; ... }; also-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt-transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt-transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated check-names ( fail | warn | ignore ); database ; file ; @@ -37,7 +35,6 @@ zone [ ] { transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; try-tcp-refresh ; - use-alt-transfer-source ; // deprecated zero-no-soa-ttl ; zone-statistics ( full | terse | none | ); }; diff --git a/doc/misc/options b/doc/misc/options index ea1f7d770f9..fb970713f37 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -70,8 +70,6 @@ options { allow-update { ; ... }; allow-update-forwarding { ; ... }; also-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt-transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt-transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated answer-cookie ; attach-cache ; auth-nxdomain ; @@ -305,7 +303,6 @@ options { udp-receive-buffer ; udp-send-buffer ; update-check-ksk ; - use-alt-transfer-source ; // deprecated use-v4-udp-ports { ; ... }; use-v6-udp-ports { ; ... }; v6-bias ; @@ -381,8 +378,6 @@ view [ ] { allow-update { ; ... }; allow-update-forwarding { ; ... }; also-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt-transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt-transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated attach-cache ; auth-nxdomain ; auto-dnssec ( allow | maintain | off ); // deprecated @@ -583,7 +578,6 @@ view [ ] { trusted-keys { ; ... }; // may occur multiple times, deprecated try-tcp-refresh ; update-check-ksk ; - use-alt-transfer-source ; // deprecated v6-bias ; validate-except { ; ... }; zero-no-soa-ttl ; diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt index 75d1bccadf2..5c78fc5b993 100644 --- a/doc/misc/primary.zoneopt +++ b/doc/misc/primary.zoneopt @@ -5,8 +5,6 @@ zone [ ] { allow-transfer [ port ] [ transport ] { ; ... }; allow-update { ; ... }; also-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt-transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt-transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated auto-dnssec ( allow | maintain | off ); // deprecated check-dup-records ( fail | warn | ignore ); check-integrity ; diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt index f20c5d1d0c9..7c265b37a52 100644 --- a/doc/misc/secondary.zoneopt +++ b/doc/misc/secondary.zoneopt @@ -6,8 +6,6 @@ zone [ ] { allow-transfer [ port ] [ transport ] { ; ... }; allow-update-forwarding { ; ... }; also-notify [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - alt-transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated - alt-transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; // deprecated auto-dnssec ( allow | maintain | off ); // deprecated check-names ( fail | warn | ignore ); database ; @@ -59,7 +57,6 @@ zone [ ] { transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; try-tcp-refresh ; update-check-ksk ; - use-alt-transfer-source ; // deprecated zero-no-soa-ttl ; zone-statistics ( full | terse | none | ); }; diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt index 74e2c73317d..31a1df3ab7b 100644 --- a/doc/misc/stub.zoneopt +++ b/doc/misc/stub.zoneopt @@ -22,6 +22,5 @@ zone [ ] { primaries [ port ] [ dscp ] [ source ( | * ) [ port ( | * ) ] [ dscp ] ] [ source-v6 ( | * ) [ port ( | * ) ] [ dscp ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; transfer-source ( | * ) [ port ( | * ) ] [ dscp ]; transfer-source-v6 ( | * ) [ port ( | * ) ] [ dscp ]; - use-alt-transfer-source ; // deprecated zone-statistics ( full | terse | none | ); };