From: Evan Hunt <each@isc.org>
Date: Sat, 5 Feb 2022 00:52:22 +0000 (-0800)
Subject: support $INCLUDE in makejournal
X-Git-Tag: v9.19.0~108^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2597e349639c83152c1b2c4812ade0542e7a448;p=thirdparty%2Fbind9.git

support $INCLUDE in makejournal

bin/tests/system/makejournal needs to ignore DNS_R_SEENINCLUDE
when calling dns_db_load(), otherwise it cannot generate a journal
for a zone file with a $INCLUDE statement.
---

diff --git a/bin/tests/system/makejournal.c b/bin/tests/system/makejournal.c
index 63caa9ade63..1a7c43581ac 100644
--- a/bin/tests/system/makejournal.c
+++ b/bin/tests/system/makejournal.c
@@ -75,6 +75,9 @@ loadzone(dns_db_t **db, const char *origin, const char *filename) {
 	}
 
 	result = dns_db_load(*db, filename, dns_masterformat_text, 0);
+	if (result == DNS_R_SEENINCLUDE) {
+		result = ISC_R_SUCCESS;
+	}
 	return (result);
 }