From: Mark Andrews <marka@isc.org>
Date: Wed, 26 Sep 2001 03:42:41 +0000 (+0000)
Subject: 1016.  [bug]           Slave zones with no backup file were re-transferred
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e31d3580f4f92c852b846919fa68fb0928eea4b2;p=thirdparty%2Fbind9.git

1016.  [bug]           Slave zones with no backup file were re-transferred
                       on every server reload.
---

diff --git a/CHANGES b/CHANGES
index 6657118edd5..f4c88a42ed0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+1016.	[bug]		Slave zones with no backup file were re-transferred
+			on every server reload.
+
 1006.	[bug]		If a KEY RR was found missing during DNSSEC validation,
 			an assertion failure could subsequently be triggered
 			in the resolver. [RT #1763]
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index fd2b5d8b90e..78d3a51141b 100644
--- 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.78.2.1 2001/01/09 22:32:21 bwelling Exp $ */
+/* $Id: zoneconf.c,v 1.78.2.2 2001/09/26 03:42:41 marka Exp $ */
 
 #include <config.h>
 
@@ -506,9 +506,10 @@ ns_zone_reusable(dns_zone_t *zone, dns_c_zone_t *czone) {
 	cfilename = NULL;
 	(void) dns_c_zone_getfile(czone, &cfilename);
 	zfilename = dns_zone_getfile(zone);
-	if (cfilename == NULL || zfilename == NULL ||
-	    strcmp(cfilename, zfilename) != 0)
-		return (ISC_FALSE);
+	if (!((cfilename == NULL && zfilename == NULL) ||
+	      (cfilename != NULL && cfilename != NULL &&
+	       strcmp(cfilename, zfilename) == 0)))
+	    return (ISC_FALSE);
 
 	return (ISC_TRUE);
 }