mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

more #824 fine tuning.

Browse Source 
ictx->drop is inherited when a include file is pushed.
NOTE: it is *not* restored when the include file is subsequently popped as
	the current owner is restored to the state it was before the file
	was pushed.
we missed setting source & line after one successful pushfile().
This commit is contained in:
Mark Andrews
2001-05-14 06:22:40 +00:00
parent acf9f79425
commit a9aeae8dc0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/dns/master.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: master.c,v 1.114 2001/05/11 02:35:37 marka Exp $ */
/* $Id: master.c,v 1.115 2001/05/14 06:22:40 marka Exp $ */
#include <config.h>
@@ -1111,6 +1111,8 @@ load(dns_loadctx_t *lctx) {
} else if (result != ISC_R_SUCCESS)
goto log_and_cleanup;
ictx = lctx->inc;
line = isc_lex_getsourceline(lctx->lex);
source = isc_lex_getsourcename(lctx->lex);
continue;
}
@@ -1582,6 +1584,7 @@ pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) {
dns_name_toregion((ictx->glue != NULL) ?
ictx->glue : ictx->current, &r);
dns_name_fromregion(new->current, &r);
new->drop = ictx->drop;
}
result = isc_lex_openfile(lctx->lex, master_file);