From: Mark Andrews <marka@isc.org>
Date: Thu, 21 Jan 2016 03:43:04 +0000 (+1100)
Subject: 4298.   [bug]           dns_rpz_add errors in loadzone were not being
X-Git-Tag: v9.11.0a1~183
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3ecc17d5519cc5b45cba3344344f296f3ff57776;p=thirdparty%2Fbind9.git

4298.   [bug]           dns_rpz_add errors in loadzone were not being
                        propogated up the call stack. [RT #41425]
---

diff --git a/CHANGES b/CHANGES
index e9b5d6314e6..84c906f1a7f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4298.	[bug]		dns_rpz_add errors in loadzone were not being
+			propogated up the call stack. [RT #41425]
+
 4297.	[test]		Ensure delegations in RPZ zones fail robustly.
 			[RT #41518]
 
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index f39c76feed4..34568040702 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -7028,6 +7028,7 @@ loadnode(dns_rbtdb_t *rbtdb, dns_name_t *name, dns_rbtnode_t **nodep,
 					      "dns_rbt_addnode(NSEC): %s",
 					      isc_result_totext(tmpresult),
 					      isc_result_totext(ISC_R_SUCCESS));
+			noderesult = rpzresult;
 		}
 	}
 	if (!hasnsec)