pullup:

1043.   [bug]           Specifying a transfer-source or transfer-source-v6
                        option in the zone statement for a master zone was
                        not treated as an error. [RT #1876]

diff --git a/CHANGES b/CHANGES
index b3d22666c25346b8efbc3dbfd306ccb23677bbbb..dcf124e20b88c14a7ec59f7d67581d79c8f19b91 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+1043.  [bug]           Specifying a transfer-source or transfer-source-v6
+                       option in the zone statement for a master zone was
+                       not treated as an error. [RT #1876]
+
 1042.  [bug]           The "config" logging category did not work properly.
                        [RT #1873]
 

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 9272c76886b2e3cfaeda49bb7e41e12b97f037f8..838ded23d7d4e36ed68b5388d37eb5f385c0b3af 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.87.2.1 2001/09/26 03:43:00 marka Exp $ */
+/* $Id: zoneconf.c,v 1.87.2.2 2001/10/11 03:31:03 marka Exp $ */
 
 #include <config.h>
 
@@ -509,16 +509,6 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
                                          dns_zone_clearforwardacl));
        }
 
-       obj = NULL;
-       result = ns_config_get(maps, "transfer-source", &obj);
-       INSIST(result == ISC_R_SUCCESS);
-       dns_zone_setxfrsource4(zone, cfg_obj_assockaddr(obj));
-
-       obj = NULL;
-       result = ns_config_get(maps, "transfer-source-v6", &obj);
-       INSIST(result == ISC_R_SUCCESS);
-       dns_zone_setxfrsource6(zone, cfg_obj_assockaddr(obj));
-
        /*
         * Configure slave functionality.
         */
@@ -571,6 +561,16 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
                INSIST(result == ISC_R_SUCCESS);
                dns_zone_setminretrytime(zone, cfg_obj_asuint32(obj));
 
+               obj = NULL;
+               result = ns_config_get(maps, "transfer-source", &obj);
+               INSIST(result == ISC_R_SUCCESS);
+               dns_zone_setxfrsource4(zone, cfg_obj_assockaddr(obj));
+
+               obj = NULL;
+               result = ns_config_get(maps, "transfer-source-v6", &obj);
+               INSIST(result == ISC_R_SUCCESS);
+               dns_zone_setxfrsource6(zone, cfg_obj_assockaddr(obj));
+
                break;
 
        default:

diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index 72c252c14374583df2c93078351fbdc297acb929..fa525c5eaf076b20c37af31e67b61d3ff2ab6d65 100644 (file)
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.14.2.2 2001/10/04 19:43:06 gson Exp $ */
+/* $Id: check.c,v 1.14.2.3 2001/10/11 03:31:04 marka Exp $ */
 
 #include <config.h>
 
@@ -122,8 +122,8 @@ check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab, isc_log_t *logctx) {
        { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE},
        { "maintain-ixfr-base", MASTERZONE | SLAVEZONE },
        { "max-ixfr-log-size", MASTERZONE | SLAVEZONE },
-       { "transfer-source", MASTERZONE | SLAVEZONE | STUBZONE },
-       { "transfer-source-v6", MASTERZONE | SLAVEZONE | STUBZONE },
+       { "transfer-source", SLAVEZONE | STUBZONE },
+       { "transfer-source-v6", SLAVEZONE | STUBZONE },
        { "max-transfer-time-in", SLAVEZONE | STUBZONE },
        { "max-transfer-time-out", MASTERZONE | SLAVEZONE },
        { "max-transfer-idle-in", SLAVEZONE | STUBZONE },