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 e9b5d6314e6f9fd640c30019f04a51be807b049a..84c906f1a7f8b0e84ef37c48dc3cd7e650b877dd 100644 (file)
--- 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 f39c76feed42e5569dd884e5cea0c796d57a374c..3456804070294ee0bf5c3e2857046c7a28947d4d 100644 (file)
--- 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)