From: Mark Andrews <marka@isc.org>
Date: Tue, 24 May 2005 04:30:10 +0000 (+0000)
Subject: integrity check cleanup
X-Git-Tag: v9.2.6b1~78^2~80
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=e123ebc1aab239eb40f1833bef3cc10d23095b0e;p=thirdparty%2Fbind9.git

integrity check cleanup
---

diff --git a/bin/tests/system/cacheclean/ns1/named.conf b/bin/tests/system/cacheclean/ns1/named.conf
index 57637708a5b..fa0a03b1979 100644
--- 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 c6e64070c03..6c46b4bc14f 100644
--- 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 dab176c7f08..fbf922c477a 100644
--- 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 3d3ad3ed373..816f5324d1e 100644
--- 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 41aa8bbdb22..505eedc1e8b 100644
--- 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) {