From 0be82a114d49583ae3530f46c17fe669f4ee45ea Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 21 Jan 2016 14:43:04 +1100
Subject: [PATCH] 4298.   [bug]           dns_rpz_add errors in loadzone were
 not being                         propogated up the call stack. [RT #41425]

(cherry picked from commit 3ecc17d5519cc5b45cba3344344f296f3ff57776)
---
 CHANGES         | 3 +++
 lib/dns/rbtdb.c | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 3f7cad7161..c8533f470e 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 a9a307625a..9bb2d9393b 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -6975,6 +6975,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)