From: Alessio Podda <alessio@isc.org>
Date: Tue, 19 Aug 2025 12:12:46 +0000 (+0200)
Subject: Do not skip cleanup for origin nodes in qpzone
X-Git-Tag: v9.21.12~35^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3271f5fda447be30e6770419e1036830cfea6cf4;p=thirdparty%2Fbind9.git

Do not skip cleanup for origin nodes in qpzone

Per @each, skipping cleanup of (|nsec_|nsec3_)origin nodes in
qpznode_release in qpzone.c is a residual from RBTDB, but it is
unnecessary or at most a performance optimization with QP.

Remove it to make it further changes easier to qpznode_release easier.
---

diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index 53503c76682..43f28a2b3c8 100644
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -970,10 +970,7 @@ qpznode_release(qpzonedb_t *qpdb, qpznode_t *node, uint32_t least_serial,
 	}
 
 	/* Handle easy and typical case first. */
-	if (!node->dirty &&
-	    (node->data != NULL || node == qpdb->origin ||
-	     node == qpdb->nsec_origin || node == qpdb->nsec3_origin))
-	{
+	if (!node->dirty && node->data != NULL) {
 		goto unref;
 	}