ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Expand the usage of set_ttl() before mark_header_ancient()

Browse Source 
When the mark_header_ancient() helper function was introduced, couple of
places with duplicate (or almost duplicate) code was missed.  Add
missing set_ttl() calls before mark_header_ancient(), so the handling of
expiring headers is same in all places.

(concept cherry picked from commit 58179e6a19)
This commit is contained in:
Ondřej Surý
2025-02-03 15:12:59 +01:00
parent 63e8af9270
commit 0c064cfde4
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dns/rbtdb.c
+3
View File
@@ -4690,6 +4690,7 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header,
}
free_rdataset(search->rbtdb, mctx, header);
} else {
set_ttl(search->rbtdb, header, 0);
mark_header_ancient(search->rbtdb, header);
*header_prev = header;
}
@@ -5744,6 +5745,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) {
* refcurrent(rbtnode) must be non-zero. This is so
* because 'node' is an argument to the function.
*/
set_ttl(rbtdb, header, 0);
mark_header_ancient(rbtdb, header);
if (log) {
isc_log_write(dns_lctx, category, module, level,
@@ -6035,6 +6037,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
* non-zero. This is so because 'node' is an
* argument to the function.
*/
set_ttl(rbtdb, header, 0);
mark_header_ancient(rbtdb, header);
}
} else if (EXISTS(header) && !ANCIENT(header)) {