mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
parent
8d5ec7195a
commit
ec4f7c6d0f
2 changed files with 8 additions and 1 deletions
2
CHANGES
2
CHANGES
|
|
@ -1,3 +1,5 @@
|
|||
719. [bug] Rapid reloads could trigger an assertion failure.
|
||||
[RT #743]
|
||||
|
||||
718. [cleanup] "internal" is no longer a reserved word in named.conf.
|
||||
[RT #753, #731]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: zone.c,v 1.301 2001/01/30 02:50:48 bwelling Exp $ */
|
||||
/* $Id: zone.c,v 1.302 2001/01/31 05:22:55 marka Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
|
@ -891,6 +891,11 @@ dns_zone_load(dns_zone_t *zone) {
|
|||
|
||||
INSIST(zone->type != dns_zone_none);
|
||||
|
||||
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADING)) {
|
||||
result = ISC_R_SUCCESS;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (zone->db != NULL && zone->masterfile == NULL) {
|
||||
/*
|
||||
* The zone has no master file configured, but it already
|
||||
|
|
|
|||
Loading…
Reference in a new issue