diff --git a/CHANGES b/CHANGES index 1865dbfcdf..365ee2fbf7 100644 --- 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 799fda0842..7c3340e9d7 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.92 2001/09/08 00:21:36 gson Exp $ */ +/* $Id: zoneconf.c,v 1.93 2001/09/25 23:01:15 gson Exp $ */ #include @@ -631,9 +631,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); }