From: Mark Andrews <marka@isc.org>
Date: Thu, 18 Oct 2001 00:35:20 +0000 (+0000)
Subject: 1057.   [bug]           Reloading the server after adding a "file" clause
X-Git-Tag: v9.2.0rc8~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a89c23c2d38af5107a327f61b6800ef07662d1f;p=thirdparty%2Fbind9.git

1057.   [bug]           Reloading the server after adding a "file" clause
                        to a zone statement could cause the server to
                        crash due to a typo in change 1016.
---

diff --git a/CHANGES b/CHANGES
index eecb130aff4..27f11696909 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1057.	[bug]		Reloading the server after adding a "file" clause
+			to a zone statement could cause the server to
+			crash due to a typo in change 1016.
+
 1056.	[bug]		Rndc could catch an assertion failure on SIGINT due
 			to an uninitialized variable. [RT #1908]
 
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 838ded23d7d..8660c211657 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.87.2.2 2001/10/11 03:31:03 marka Exp $ */
+/* $Id: zoneconf.c,v 1.87.2.3 2001/10/18 00:35:20 marka Exp $ */
 
 #include <config.h>
 
@@ -600,7 +600,7 @@ ns_zone_reusable(dns_zone_t *zone, cfg_obj_t *zconfig) {
 		cfilename = NULL;
 	zfilename = dns_zone_getfile(zone);
 	if (!((cfilename == NULL && zfilename == NULL) ||
-	      (cfilename != NULL && cfilename != NULL &&
+	      (cfilename != NULL && zfilename != NULL &&
 	       strcmp(cfilename, zfilename) == 0)))
 	    return (ISC_FALSE);