From: Mark Andrews <marka@isc.org>
Date: Tue, 15 Nov 2022 23:09:56 +0000 (+1100)
Subject: Properly select active rdatasets when iterating across node
X-Git-Tag: v9.19.8~7^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bdab2d111a76b048285bb1db66be04209a1fc6a;p=thirdparty%2Fbind9.git

Properly select active rdatasets when iterating across node

Active rdatasets where not being properly selected in rdatasetiter_first
and rdatasetiter_next.
---

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index de5d3b170c3..c7550b474ad 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -8867,10 +8867,7 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) {
 				 *  queries for 0 TTL rdatasets to work.
 				 */
 				if (NONEXISTENT(header) ||
-				    (now != 0 &&
-				     (now - RBTDB_VIRTUAL) >
-					     header->rdh_ttl +
-						     STALE_TTL(header, rbtdb)))
+				    (now != 0 && now > header->rdh_ttl))
 				{
 					header = NULL;
 				}
@@ -8950,9 +8947,7 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) {
 					 * queries for 0 TTL rdatasets to work.
 					 */
 					if (NONEXISTENT(header) ||
-					    (now != 0 &&
-					     (now - RBTDB_VIRTUAL) >
-						     header->rdh_ttl))
+					    (now != 0 && now > header->rdh_ttl))
 					{
 						header = NULL;
 					}