- Fix to remove unused code from rpz resolve client and action

  function.

diff --git a/doc/Changelog b/doc/Changelog
index eb6fec0b0f2b592500d2be29a91c6174ba54f5f2..aaf7383f5cbbb55b55524dcba064a72d3d255603 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -8,6 +8,8 @@
          zone. It is not relative but a fully qualified domain name.
        - Fix analyzer review failure in rpz action override code to not
          crash on unlocking the local zone lock.
+       - Fix to remove unused code from rpz resolve client and action
+         function.
 
 2 November 2021: Wouter
        - Fix #552: Unbound assumes index.html exists on RPZ host.

diff --git a/services/rpz.c b/services/rpz.c
index 6c1fb330f063f03c3ba5a5c59f5a0e1bb178f466..1e559640597c37cd2f88f8731b997052df3f07f7 100644 (file)
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -1487,11 +1487,6 @@ rpz_resolve_client_action_and_zone(struct auth_zones* az, struct query_info* qin
                }
                if(z || node) {
                        break;
-               } else {
-                       if(node != NULL) {
-                               lock_rw_unlock(&node->lock);
-                               node = NULL;
-                       }
                }
                /* not found in this auth_zone */
                lock_rw_unlock(&a->lock);