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 eecb130aff40b644bd21a43044919031c20aab89..27f11696909a6cb610817aa9bb18046b3195f325 100644 (file)
--- 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 838ded23d7d4e36ed68b5388d37eb5f385c0b3af..8660c21165748b90f5b32d9ba60613ae8959e1a2 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.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);