From: Colin Vidal <colin@isc.org>
Date: Sat, 24 Jan 2026 16:57:34 +0000 (+0100)
Subject: rename fetch response `db` field to `cache`
X-Git-Tag: v9.21.19~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e62cafd3c76a9bb6c37f796dce507dd9cb47d47f;p=thirdparty%2Fbind9.git

rename fetch response `db` field to `cache`

As the `dns_fetchresponse_t` `db` field can only be attached to the
resolver cache database, rename it into `cache` to avoid ambiguities.
---

diff --git a/bin/named/server.c b/bin/named/server.c
index 9b3f1700255..006b90c33c1 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6461,8 +6461,8 @@ tat_done(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 
 	dns_resolver_freefresp(&resp);
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index f5cfa7e58eb..06256be5886 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -2586,8 +2586,8 @@ fetch_callback(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 
 	if (atomic_load(&adb->shuttingdown)) {
diff --git a/lib/dns/client.c b/lib/dns/client.c
index 0e2d12f1aa0..2097fa3ec58 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -531,7 +531,7 @@ client_resfind(resctx_t *rctx, dns_fetchresponse_t *resp) {
 			INSIST(resp != NULL);
 			INSIST(resp->fetch == rctx->fetch);
 			dns_resolver_destroyfetch(&rctx->fetch);
-			db = resp->db;
+			db = resp->cache;
 			node = resp->node;
 			result = resp->result;
 			vresult = resp->vresult;
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 406e7d47d77..5c56d5d86d0 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -82,7 +82,7 @@ struct dns_fetchresponse {
 	isc_result_t	      vresult;
 	dns_edectx_t	     *edectx;
 	dns_rdatatype_t	      qtype;
-	dns_db_t	     *db;
+	dns_db_t	     *cache;
 	dns_dbnode_t	     *node;
 	dns_rdataset_t	     *rdataset;
 	dns_rdataset_t	     *sigrdataset;
diff --git a/lib/dns/nta.c b/lib/dns/nta.c
index 17345e26138..aba39e95c6a 100644
--- a/lib/dns/nta.c
+++ b/lib/dns/nta.c
@@ -163,8 +163,8 @@ fetch_done(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 
 	dns_resolver_freefresp(&resp);
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 56313bc2b4f..f475af5ffd2 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1645,7 +1645,7 @@ copy_to_resp(fetchctx_t *fctx, dns_fetchresponse_t *resp) {
 
 	dns_name_copy(fctx->resp.foundname, resp->foundname);
 
-	dns_db_attach(fctx->cache, &resp->db);
+	dns_db_attach(fctx->cache, &resp->cache);
 	dns_db_attachnode(fctx->resp_node, &resp->node);
 
 	if (dns_rdataset_isassociated(&fctx->resp.rdataset)) {
@@ -1666,8 +1666,8 @@ pull_from_resp(dns_fetchresponse_t *resp, fetchctx_t *fctx) {
 	if (dns_rdataset_isassociated(resp->sigrdataset)) {
 		dns_rdataset_clone(resp->sigrdataset, &fctx->resp.sigrdataset);
 	}
-	if (resp->db != NULL) {
-		INSIST(resp->db == fctx->cache);
+	if (resp->cache != NULL) {
+		INSIST(resp->cache == fctx->cache);
 	}
 	if (resp->node != NULL) {
 		dns_db_attachnode(resp->node, &fctx->resp_node);
@@ -4362,8 +4362,8 @@ clear_resp(dns_fetchresponse_t **respp) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 	dns_rdataset_cleanup(resp->rdataset);
 	dns_rdataset_cleanup(resp->sigrdataset);
@@ -6827,8 +6827,8 @@ resume_dslookup(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 
 	/* Preserve data from resp before freeing it. */
@@ -9804,8 +9804,8 @@ prime_done(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 	dns_rdataset_cleanup(resp->rdataset);
 	INSIST(resp->sigrdataset == NULL);
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 5316e9a6667..2e731a7576c 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -427,8 +427,8 @@ fetch_callback_dnskey(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 	dns_rdataset_cleanup(&val->fsigrdataset);
 
@@ -520,8 +520,8 @@ fetch_callback_ds(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 	dns_rdataset_cleanup(&val->fsigrdataset);
 
diff --git a/lib/dns/zonefetch.c b/lib/dns/zonefetch.c
index d8a5df9b187..d73c6df6ef1 100644
--- a/lib/dns/zonefetch.c
+++ b/lib/dns/zonefetch.c
@@ -148,8 +148,8 @@ dns_zonefetch_done(void *arg) {
 	if (resp->node != NULL) {
 		dns_db_detachnode(&resp->node);
 	}
-	if (resp->db != NULL) {
-		dns_db_detach(&resp->db);
+	if (resp->cache != NULL) {
+		dns_db_detach(&resp->cache);
 	}
 	dns_resolver_destroyfetch(&fetch->fetch);
 
diff --git a/lib/ns/query.c b/lib/ns/query.c
index b23db80903b..59165a2537e 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -2591,8 +2591,8 @@ free_fresp(ns_client_t *client, dns_fetchresponse_t **frespp) {
 	if (fresp->node != NULL) {
 		dns_db_detachnode(&fresp->node);
 	}
-	if (fresp->db != NULL) {
-		dns_db_detach(&fresp->db);
+	if (fresp->cache != NULL) {
+		dns_db_detach(&fresp->cache);
 	}
 	if (fresp->rdataset != NULL) {
 		ns_client_putrdataset(client, &fresp->rdataset);
@@ -6385,7 +6385,7 @@ query_resume(query_ctx_t *qctx) {
 		if (qctx->fresp->node != NULL) {
 			dns_db_detachnode(&qctx->fresp->node);
 		}
-		SAVE(qctx->rpz_st->r.db, qctx->fresp->db);
+		SAVE(qctx->rpz_st->r.db, qctx->fresp->cache);
 		qctx->rpz_st->r.r_type = qctx->fresp->qtype;
 		SAVE(qctx->rpz_st->r.r_rdataset, qctx->fresp->rdataset);
 		ns_client_putrdataset(qctx->client, &qctx->fresp->sigrdataset);
@@ -6423,15 +6423,15 @@ query_resume(query_ctx_t *qctx) {
 		if (qctx->fresp->node != NULL) {
 			dns_db_detachnode(&qctx->fresp->node);
 		}
-		if (qctx->fresp->db != NULL) {
-			dns_db_detach(&qctx->fresp->db);
+		if (qctx->fresp->cache != NULL) {
+			dns_db_detach(&qctx->fresp->cache);
 		}
 	} else {
 		CCTRACE(ISC_LOG_DEBUG(3), "resume from normal recursion");
 		qctx->authoritative = false;
 
 		qctx->qtype = qctx->fresp->qtype;
-		SAVE(qctx->db, qctx->fresp->db);
+		SAVE(qctx->db, qctx->fresp->cache);
 		SAVE(qctx->node, qctx->fresp->node);
 		SAVE(qctx->rdataset, qctx->fresp->rdataset);
 		SAVE(qctx->sigrdataset, qctx->fresp->sigrdataset);