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 a387c6c746cfa1095ce0112ad7957dccb5ca7aa1..b87726a0ffc79bbe13a036b6771054bb62c98df6 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.
+
 1052.  [bug]           Journals were not being created in binary mode
                        resulting in "journal format not recognized" error
                        under Windows NT/2000.  [RT #1889]

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 78d3a51141b31934c28cd5bc03b92b980f0127eb..f60c01739439a49f0d3ae1de9bb213f08f46c9ce 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.78.2.2 2001/09/26 03:42:41 marka Exp $ */
+/* $Id: zoneconf.c,v 1.78.2.3 2001/10/18 00:38:38 marka Exp $ */
 
 #include <config.h>
 
@@ -507,7 +507,7 @@ ns_zone_reusable(dns_zone_t *zone, dns_c_zone_t *czone) {
        (void) dns_c_zone_getfile(czone, &cfilename);
        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);