1016. [bug] Slave zones with no backup file were re-transferred

                       on every server reload.

diff --git a/CHANGES b/CHANGES
index af2d628e1d0cf890179399d024b08495e9c518bf..2d80ef2bc5d32a5f7bace537d9fb1e313cddc8a7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
   
+1016.  [bug]           Slave zones with no backup file were re-transferred
+                       on every server reload.
+
 1015.  [bug]           Log channels that had a "versions" option but no
                        "size" option failed to create numbered log
                        files. [RT #1783]

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 74cdd90216f408618419966e6376b3e9671619c7..9272c76886b2e3cfaeda49bb7e41e12b97f037f8 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 2001/08/07 01:58:58 marka Exp $ */
+/* $Id: zoneconf.c,v 1.87.2.1 2001/09/26 03:43:00 marka Exp $ */
 
 #include <config.h>
 
@@ -599,9 +599,10 @@ ns_zone_reusable(dns_zone_t *zone, cfg_obj_t *zconfig) {
        else
                cfilename = NULL;
        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);
 }