integrity check cleanup

diff --git a/bin/tests/system/cacheclean/ns1/named.conf b/bin/tests/system/cacheclean/ns1/named.conf
index 57637708a5bb4162f161bb6dc383e23b328ee7dc..fa0a03b19792f8e20c015dd1f7d785ee8331ef42 100644 (file)
--- a/bin/tests/system/cacheclean/ns1/named.conf
+++ b/bin/tests/system/cacheclean/ns1/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2004/03/05 04:59:20 marka Exp $ */
+/* $Id: named.conf,v 1.5 2005/05/24 04:30:08 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -29,6 +29,7 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
+       integrity-check no;
 };
 
 zone "." {

diff --git a/bin/tests/system/checknames/ns1/named.conf b/bin/tests/system/checknames/ns1/named.conf
index c6e64070c030782910b03a9552bd1b274f95878e..6c46b4bc14f7bdc6909be366aec7e984246b9103 100644 (file)
--- a/bin/tests/system/checknames/ns1/named.conf
+++ b/bin/tests/system/checknames/ns1/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2004/03/05 04:59:38 marka Exp $ */
+/* $Id: named.conf,v 1.5 2005/05/24 04:30:09 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
         listen-on-v6 { none; };
         recursion no;
         notify yes;
+       integrity-check no;
 };
 
 zone "." {

diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf
index dab176c7f0866dfe8efd89218d6a3a1c153c2198..fbf922c477acaad67c7fde70ab66c80636dfd39c 100644 (file)
--- a/bin/tests/system/glue/ns1/named.conf
+++ b/bin/tests/system/glue/ns1/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.10 2004/03/05 05:00:58 marka Exp $ */
+/* $Id: named.conf,v 1.11 2005/05/24 04:30:09 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -30,6 +30,7 @@ options {
        recursion no;
        notify no;
        cache-file "cache";
+       integrity-check no;
 };
 
 zone "." {

diff --git a/bin/tests/system/xfer/ns2/named.conf b/bin/tests/system/xfer/ns2/named.conf
index 3d3ad3ed373f185fefa93aaffc7424fee50915a1..816f5324d1e68b440e5b029c8265a3cc0b1fbb3b 100644 (file)
--- a/bin/tests/system/xfer/ns2/named.conf
+++ b/bin/tests/system/xfer/ns2/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.18 2004/03/05 05:03:59 marka Exp $ */
+/* $Id: named.conf,v 1.19 2005/05/24 04:30:09 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -30,6 +30,7 @@ options {
        recursion no;
        notify yes;
        ixfr-from-differences yes;
+       integrity-check no;
 };
 
 include "../../common/controls.conf";

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 41aa8bbdb22e6c97c8f4228f1c25eeb17f3ef17c..505eedc1e8b3d297cbc3096b03bafbb74a6dde64 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.434 2005/05/19 04:59:03 marka Exp $ */
+/* $Id: zone.c,v 1.435 2005/05/24 04:30:10 marka Exp $ */
 
 /*! \file */
 
@@ -1617,7 +1617,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
                /*
                 * Remember bottom of zone.
                 */
-               dns_name_dup(name, NULL, bottom);
+               dns_name_copy(name, bottom, NULL);
 
                result = dns_rdataset_first(&rdataset);
                while (result == ISC_R_SUCCESS) {