diff --git a/CHANGES b/CHANGES index c83a9b6334..a34a0ea2b6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + 716. [bug] The first line of a $INCLUDE master file was lost if + a origin was specified. [RT #744] 715. [bug] Resolving some A6 chains could cause an assertion failure in adb.c. [RT #738] diff --git a/lib/dns/master.c b/lib/dns/master.c index ac906892d4..9e6e0975a6 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: master.c,v 1.101 2001/01/22 03:34:25 marka Exp $ */ +/* $Id: master.c,v 1.102 2001/01/30 13:23:32 marka Exp $ */ #include @@ -83,7 +83,7 @@ typedef ISC_LIST(dns_rdatalist_t) rdatalist_head_t; /* - * Master file loading state that persists across $INCLUDEs. + * Master file load state. */ struct dns_loadctx { @@ -813,6 +813,7 @@ load(dns_loadctx_t **ctxp) { CTX_COPYVAR(ctx, *ctxp, result); dns_loadctx_detach(&ctx); ctx = *ctxp; + read_till_eol = ISC_TRUE; continue; } done = ISC_TRUE; @@ -923,7 +924,6 @@ load(dns_loadctx_t **ctxp) { * to domain name processing code and do * the actual inclusion later. */ - read_till_eol = ISC_TRUE; finish_include = ISC_TRUE; } else if (strcasecmp(token.value.as_pointer, "$DATE") == 0) {