From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 5 Nov 2021 11:13:38 +0000 (+0100)
Subject: - Fix to remove unused code from rpz resolve client and action
X-Git-Tag: release-1.14.0rc1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=738c7db9abb7a03d08b07e0b7d9f317f9f6105e7;p=thirdparty%2Funbound.git

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

diff --git a/doc/Changelog b/doc/Changelog
index eb6fec0b0..aaf7383f5 100644
--- 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 6c1fb330f..1e5596405 100644
--- 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);