diff --git a/CHANGES b/CHANGES index 422cc3c6c3..ded22c39ac 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ + + 385. [cleanup] Removed function dns_zone_equal(). + 384. [bug] nsupdate was incorrectly limiting TTLs to 65535 instead of 2147483647. diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index f6a8631fa4..cf0824420e 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.h,v 1.67 2000/08/10 00:53:36 gson Exp $ */ +/* $Id: zone.h,v 1.68 2000/08/10 18:35:44 gson Exp $ */ #ifndef DNS_ZONE_H #define DNS_ZONE_H 1 @@ -834,20 +834,6 @@ dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump); * 'zone' to be a valid zone. */ -isc_boolean_t -dns_zone_equal(dns_zone_t *oldzone, dns_zone_t *newzone); -/* - * Tests whether the configuration of two zones is equal. - * Zone contents and state information is not tested. - * - * Requires: - * 'oldzone' and 'newzone' to be valid. - * - * Returns: - * ISC_TRUE if the configurations are equal. - * ISC_FALSE if the configurations differ. - */ - isc_uint32_t dns_zone_getidlein(dns_zone_t *zone); /* diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 0b5655d77b..be1a0313a1 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.179 2000/08/10 17:11:23 bwelling Exp $ */ +/* $Id: zone.c,v 1.180 2000/08/10 18:35:46 gson Exp $ */ #include @@ -3753,84 +3753,6 @@ notify_done(isc_task_t *task, isc_event_t *event) { dns_zone_idetach(&zone); } - -isc_boolean_t -dns_zone_equal(dns_zone_t *oldzone, dns_zone_t *newzone) { - unsigned int i; - - REQUIRE(DNS_ZONE_VALID(oldzone)); - REQUIRE(DNS_ZONE_VALID(newzone)); - - LOCK(&oldzone->lock); - LOCK(&newzone->lock); - if (oldzone->type != newzone->type || - oldzone->maxxfrin != newzone->maxxfrin || - oldzone->maxxfrout != newzone->maxxfrout || - oldzone->idlein != newzone->idlein || - oldzone->idleout != newzone->idleout || - oldzone->rdclass != newzone->rdclass || - oldzone->db_argc != newzone->db_argc || - oldzone->notifycnt != newzone->notifycnt || - oldzone->masterscnt != newzone->masterscnt || - oldzone->check_names != newzone->check_names || - oldzone->diff_on_reload != newzone->diff_on_reload || - oldzone->journalsize != newzone->journalsize) - goto false; - - if (!dns_name_equal(&oldzone->origin, &newzone->origin)) - goto false; - - if ((oldzone->journal == NULL && newzone->journal != NULL) || - (oldzone->journal != NULL && newzone->journal == NULL) || - (oldzone->journal != NULL && - strcmp(oldzone->journal, newzone->journal) != 0)) - goto false; - - for (i = 0; i < oldzone->db_argc; i++) - if (strcmp(oldzone->db_argv[i], newzone->db_argv[i]) != 0) - goto false; - - if (!isc_sockaddr_equal(&oldzone->xfrsource4, &newzone->xfrsource4)) - goto false; - - if (!isc_sockaddr_equal(&oldzone->xfrsource6, &newzone->xfrsource6)) - goto false; - - for (i = 0; i < oldzone->notifycnt; i++) - if (!isc_sockaddr_equal(&oldzone->notify[i], - &newzone->notify[i])) - goto false; - - for (i = 0; i < oldzone->masterscnt; i++) - if (!isc_sockaddr_equal(&oldzone->masters[i], - &newzone->masters[i])) - goto false; - -#define COMPARE_POINTERS(equalp, member) \ - if ((oldzone->member == NULL && newzone->member != NULL) || \ - (oldzone->member != NULL && newzone->member == NULL) || \ - (oldzone->member != NULL && \ - !(equalp)(oldzone->member, newzone->member))) \ - goto false - - COMPARE_POINTERS(dns_acl_equal, update_acl); - COMPARE_POINTERS(dns_acl_equal, query_acl); - COMPARE_POINTERS(dns_acl_equal, xfr_acl); - -#undef COMPARE_POINTERS - - UNLOCK(&newzone->lock); - UNLOCK(&oldzone->lock); - return(ISC_TRUE); /* XXX should be ISC_TRUE once acl/pubkey - checks are done. */ - - false: - UNLOCK(&newzone->lock); - UNLOCK(&oldzone->lock); - return (ISC_FALSE); -} - - isc_result_t dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { isc_result_t result;