mirror of
https://github.com/isc-projects/bind9.git
synced 2026-04-29 09:59:08 -04:00
pullup:
alt-transfer-source-v4 -> alt-transfer-source
This commit is contained in:
parent
1c2bf5f1cb
commit
e0d0647c9d
5 changed files with 13 additions and 13 deletions
2
CHANGES
2
CHANGES
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
1446. [func] Implemented undocumented alternate transfer sources
|
||||
from BIND 8. See use-alt-transfer-source,
|
||||
alt-transfer-source-v4 and alt-transfer-source-v6.
|
||||
alt-transfer-source and alt-transfer-source-v6.
|
||||
|
||||
SECURITY: use-alt-transfer-source is ENABLED unless
|
||||
you are using views. This may caues a security risk
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: config.c,v 1.11.2.4.8.15 2003/08/27 02:13:46 marka Exp $ */
|
||||
/* $Id: config.c,v 1.11.2.4.8.16 2003/08/27 02:23:38 marka Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ options {\n\
|
|||
# max-ixfr-log-size <obsolete>\n\
|
||||
transfer-source *;\n\
|
||||
transfer-source-v6 *;\n\
|
||||
alt-transfer-source-v4 *;\n\
|
||||
alt-transfer-source *;\n\
|
||||
alt-transfer-source-v6 *;\n\
|
||||
max-transfer-time-in 120;\n\
|
||||
max-transfer-time-out 120;\n\
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: zoneconf.c,v 1.87.2.4.10.6 2003/08/27 02:13:46 marka Exp $ */
|
||||
/* $Id: zoneconf.c,v 1.87.2.4.10.7 2003/08/27 02:23:38 marka Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
|
@ -632,7 +632,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
|
|||
RETERR(dns_zone_setxfrsource6(zone, cfg_obj_assockaddr(obj)));
|
||||
|
||||
obj = NULL;
|
||||
result = ns_config_get(maps, "alt-transfer-source-v4", &obj);
|
||||
result = ns_config_get(maps, "alt-transfer-source", &obj);
|
||||
INSIST(result == ISC_R_SUCCESS);
|
||||
RETERR(dns_zone_setaltxfrsource4(zone, cfg_obj_assockaddr(obj)));
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
|
||||
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
|
||||
|
||||
<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.27.2.25 2003/08/27 02:13:47 marka Exp $ -->
|
||||
<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.27.2.26 2003/08/27 02:23:38 marka Exp $ -->
|
||||
|
||||
<book>
|
||||
<title>BIND 9 Administrator Reference Manual</title>
|
||||
|
|
@ -2730,7 +2730,7 @@ statement in the <filename>named.conf</filename> file:</para>
|
|||
<optional> transfers-per-ns <replaceable>number</replaceable>; </optional>
|
||||
<optional> transfer-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> transfer-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> alt-transfer-source-v4 (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> alt-transfer-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> alt-transfer-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> use-alt-transfer-source <replaceable>yes_or_no</replaceable>; </optional>
|
||||
<optional> notify-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
|
|
@ -3544,7 +3544,7 @@ in the configuration file.</para>
|
|||
except zone transfers are performed using IPv6.</para>
|
||||
</listitem></varlistentry>
|
||||
|
||||
<varlistentry><term><command>alt-transfer-source-v4</command></term>
|
||||
<varlistentry><term><command>alt-transfer-source</command></term>
|
||||
<listitem><para>An alternate transfer source if the one listed in
|
||||
<command>transfer-source</command> fails and
|
||||
<command>use-alt-transfer-source</command> is set.</para>
|
||||
|
|
@ -4310,7 +4310,7 @@ Statement Grammar</title>
|
|||
<optional> pubkey <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>string</replaceable> ; </optional>
|
||||
<optional> transfer-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> transfer-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> alt-transfer-source-v4 (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> alt-transfer-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> alt-transfer-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
<optional> use-alt-transfer-source <replaceable>yes_or_no</replaceable>; </optional>
|
||||
<optional> notify-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
|
||||
|
|
@ -4608,9 +4608,9 @@ information for this zone, which can be dumped to the
|
|||
</para>
|
||||
</listitem></varlistentry>
|
||||
|
||||
<varlistentry><term><command>alt-transfer-source-v4</command></term>
|
||||
<varlistentry><term><command>alt-transfer-source</command></term>
|
||||
<listitem><para>See the description of
|
||||
<command>alt-transfer-source-v4</command> in <xref linkend="zone_transfers"/>
|
||||
<command>alt-transfer-source</command> in <xref linkend="zone_transfers"/>
|
||||
</para>
|
||||
</listitem></varlistentry>
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: namedconf.c,v 1.21.44.15 2003/08/27 02:13:50 marka Exp $ */
|
||||
/* $Id: namedconf.c,v 1.21.44.16 2003/08/27 02:23:39 marka Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
|
@ -702,7 +702,7 @@ zone_clauses[] = {
|
|||
{ "sig-validity-interval", &cfg_type_uint32, 0 },
|
||||
{ "transfer-source", &cfg_type_sockaddr4wild, 0 },
|
||||
{ "transfer-source-v6", &cfg_type_sockaddr6wild, 0 },
|
||||
{ "alt-transfer-source-v4", &cfg_type_sockaddr4wild, 0 },
|
||||
{ "alt-transfer-source", &cfg_type_sockaddr4wild, 0 },
|
||||
{ "alt-transfer-source-v6", &cfg_type_sockaddr6wild, 0 },
|
||||
{ "use-alt-transfer-source", &cfg_type_boolean, 0 },
|
||||
{ "zone-statistics", &cfg_type_boolean, 0 },
|
||||
|
|
|
|||
Loading…
Reference in a new issue