pullup:

 716.  [bug]           The first line of a $INCLUDE master file was lost if
                       a origin was specified. [RT #744]
 Adjust comment.

diff --git a/CHANGES b/CHANGES
index 3750062cd9c516800f20f94fbfe6264bfd13681a..5b9f47e62b04c275ca90564881ddc7cccf081f1a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
                        reference an uninitialized variable, causing the
                        server to crash. [RT #750]
 
+ 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 035ebc8181db16d2203529dbc569f6de1c8cf5ea..cd7a1c76e0cb1bca9ebd010c504c95465c531874 100644 (file)
--- 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.88.2.6 2001/01/22 18:24:41 gson Exp $ */
+/* $Id: master.c,v 1.88.2.7 2001/01/31 18:06:29 gson Exp $ */
 
 #include <config.h>
 
@@ -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 {
@@ -769,6 +769,7 @@ load(dns_loadctx_t **ctxp) {
                                CTX_COPYVAR(ctx, *ctxp, seen_include);
                                dns_loadctx_detach(&ctx);
                                ctx = *ctxp;
+                               read_till_eol = ISC_TRUE;
                                continue;
                        }
                        done = ISC_TRUE;
@@ -872,7 +873,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) {