588. [bug] ctx->in_use was not being correctly initalised when

                        when pushing a file for $INCLUDE. [RT #523]

diff --git a/CHANGES b/CHANGES
index 95868ab7d08826be2e5a276bd4e264a8e8a1efed..e02aea0f10354914cc4233046043a70c64d52684 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 588.  [bug]           ctx->in_use was not being correctly initalised when
+                       when pushing a file for $INCLUDE. [RT #523]
 
  587.  [func]          A warning is now printed if the "allow-update"
                        option allows updates based on the source IP

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 54517f77cc17e57be4642d4e06e55d0f665958ce..13c27ad6281562a0a0e27049c47bcc0382d8fe7f 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.84 2000/12/01 00:55:16 gson Exp $ */
+/* $Id: master.c,v 1.85 2000/12/04 04:17:00 marka Exp $ */
 
 #include <config.h>
 
@@ -1437,13 +1437,13 @@ pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t **ctxp) {
        /* Set current domain. */
        if (ctx->glue != NULL || ctx->current != NULL) {
                for (new_in_use = 0; new_in_use < NBUFS ; new_in_use++)
-                       if (!ctx->in_use[new_in_use])
+                       if (!new->in_use[new_in_use])
                                break;
                INSIST(new_in_use < NBUFS);
                new->current_in_use = new_in_use;
                new->current =
                        dns_fixedname_name(&new->fixed[new->current_in_use]);
-               new->in_use[ctx->current_in_use] = ISC_TRUE;
+               new->in_use[new->current_in_use] = ISC_TRUE;
                dns_name_toregion((ctx->glue != NULL) ?
                                   ctx->glue : ctx->current, &r);
                dns_name_fromregion(new->current, &r);