alt-transfer-source-v4 -> alt-transfer-source

diff --git a/CHANGES b/CHANGES
index edb2918fda0e149c868f21daf3a2a7d22b4be18e..e0d96b7294c43655777269b7747d89009e1c2e03 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,7 +12,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

diff --git a/bin/named/config.c b/bin/named/config.c
index d150673c118aced33910c64995fb912273f907d4..622efab0a5a0f63d6decab94c9cbd96524d07bde 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.40 2003/02/26 23:28:58 marka Exp $ */
+/* $Id: config.c,v 1.41 2003/02/27 05:12:47 marka Exp $ */
 
 #include <config.h>
 
@@ -136,7 +136,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\

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 9e938b8a7b6dc94145acc62be3e39974ed4c7718..b42872b9d0de70fd3c7bacccaaa3c94bdf35e186 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.105 2003/02/26 23:28:58 marka Exp $ */
+/* $Id: zoneconf.c,v 1.106 2003/02/27 05:12:47 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)));
 

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 1cb9dcd0edacc6650cadb8aca05e71cf0f5e5230..82dc7cd7461e890fb2936a708e8f0251ec52ed5d 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -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.218 2003/02/26 23:28:58 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.219 2003/02/27 05:12:46 marka Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -2764,7 +2764,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>
@@ -3623,7 +3623,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>
@@ -4454,7 +4454,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>
@@ -4744,9 +4744,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>
 

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 14ec28a752069f93ed24f30ee8f0acf848f4206b..a2b9c859ce19bf23365ba7dbcf8d1a435812139b 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.19 2003/02/26 23:29:00 marka Exp $ */
+/* $Id: namedconf.c,v 1.20 2003/02/27 05:12:45 marka Exp $ */
 
 #include <config.h>
 
@@ -696,7 +696,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 },