Commit ff65265e6a for bind

commit ff65265e6a1e66253a112b9da810f4a07437609f
Author: Alessio Podda <alessio@isc.org>
Date:   Thu Sep 10 20:03:22 2026 +0200

    Add zt and fwdtable helper functions

    Most of the time dns_zt_find and dns_fwdtable_find are overkill
    for their uses in zone and forwarding setup. Add some helpers to
    simplify the zone setup logic.

diff --git a/bin/named/server.c b/bin/named/server.c
index 01b64b5ac7..238f057529 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -2194,7 +2194,7 @@ static void
 catz_addmodzone_cb(void *arg) {
 	catz_chgzone_t *cz = (catz_chgzone_t *)arg;
 	isc_result_t result;
-	dns_forwarders_t *dnsforwarders = NULL;
+	dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none;
 	dns_name_t *name = NULL;
 	isc_buffer_t namebuf;
 	isc_buffer_t *confbuf = NULL;
@@ -2215,10 +2215,8 @@ catz_addmodzone_cb(void *arg) {
 	dns_name_totext(name, DNS_NAME_OMITFINALDOT, &namebuf);
 	isc_buffer_putuint8(&namebuf, 0);

-	result = dns_fwdtable_find(view->fwdtable, name, &dnsforwarders);
-	if (result == ISC_R_SUCCESS &&
-	    dnsforwarders->fwdpolicy == dns_fwdpolicy_only)
-	{
+	result = dns_fwdtable_covers(view->fwdtable, name, NULL, &fwdpolicy);
+	if (result == ISC_R_SUCCESS && fwdpolicy == dns_fwdpolicy_only) {
 		isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER,
 			      ISC_LOG_WARNING,
 			      "catz: catz_addmodzone_cb: "
@@ -2399,9 +2397,6 @@ cleanup:
 	if (zoneconf != NULL) {
 		cfg_obj_detach(&zoneconf);
 	}
-	if (dnsforwarders != NULL) {
-		dns_forwarders_detach(&dnsforwarders);
-	}
 	dns_catz_entry_detach(cz->origin, &cz->entry);
 	dns_catz_zone_detach(&cz->origin);
 	dns_view_weakdetach(&view);
@@ -5235,7 +5230,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
 		for (empty = empty_zones[empty_zone]; empty != NULL;
 		     empty = empty_zones[++empty_zone])
 		{
-			dns_forwarders_t *dnsforwarders = NULL;
 			dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none;

 			/*
@@ -5252,10 +5246,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
 			/*
 			 * This zone already exists.
 			 */
-			(void)dns_view_findzone(view, name, DNS_ZTFIND_EXACT,
-						&zone);
-			if (zone != NULL) {
-				dns_zone_detach(&zone);
+			if (dns_view_containszone(view, name)) {
 				continue;
 			}

@@ -5263,14 +5254,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
 			 * If we would forward this name don't add a
 			 * empty zone for it.
 			 */
-			result = dns_fwdtable_find(view->fwdtable, name,
-						   &dnsforwarders);
-			if (result == ISC_R_SUCCESS ||
-			    result == DNS_R_PARTIALMATCH)
-			{
-				fwdpolicy = dnsforwarders->fwdpolicy;
-				dns_forwarders_detach(&dnsforwarders);
-			}
+			(void)dns_fwdtable_covers(view->fwdtable, name, NULL,
+						  &fwdpolicy);
 			if (fwdpolicy == dns_fwdpolicy_only) {
 				continue;
 			}
@@ -5344,31 +5329,21 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
 		for (ipv4only_zone = 0; ipv4only_zone < ARRAY_SIZE(zones);
 		     ipv4only_zone++)
 		{
-			dns_forwarders_t *dnsforwarders = NULL;
 			dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none;

 			CHECK(dns_name_fromstring(name,
 						  zones[ipv4only_zone].name,
 						  dns_rootname, 0, NULL));

-			(void)dns_view_findzone(view, name, DNS_ZTFIND_EXACT,
-						&zone);
-			if (zone != NULL) {
-				dns_zone_detach(&zone);
+			if (dns_view_containszone(view, name)) {
 				continue;
 			}

 			/*
 			 * If we would forward this name don't add it.
 			 */
-			result = dns_fwdtable_find(view->fwdtable, name,
-						   &dnsforwarders);
-			if (result == ISC_R_SUCCESS ||
-			    result == DNS_R_PARTIALMATCH)
-			{
-				fwdpolicy = dnsforwarders->fwdpolicy;
-				dns_forwarders_detach(&dnsforwarders);
-			}
+			(void)dns_fwdtable_covers(view->fwdtable, name, NULL,
+						  &fwdpolicy);
 			if (fwdpolicy == dns_fwdpolicy_only) {
 				continue;
 			}
diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index b5da35cfc1..6ca0af6211 100644
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -175,6 +175,31 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name,
 	return result;
 }

+isc_result_t
+dns_fwdtable_covers(dns_fwdtable_t *fwdtable, const dns_name_t *name,
+		    dns_name_t *foundname, dns_fwdpolicy_t *policy) {
+	isc_result_t result;
+	dns_qpread_t qpr;
+	void *pval = NULL;
+
+	REQUIRE(VALID_FWDTABLE(fwdtable));
+	REQUIRE(dns_name_isabsolute(name));
+
+	dns_qpmulti_query(fwdtable->table, &qpr);
+	result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
+			       &pval, NULL);
+	if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
+		dns_forwarders_t *fwdrs = pval;
+		if (foundname != NULL) {
+			dns_name_copy(&fwdrs->name, foundname);
+		}
+		SET_IF_NOT_NULL(policy, fwdrs->fwdpolicy);
+	}
+	dns_qpread_destroy(fwdtable->table, &qpr);
+
+	return result;
+}
+
 isc_result_t
 dns_fwdtable_finddeepestonly(dns_fwdtable_t *fwdtable, const dns_name_t *name,
 			     dns_name_t *foundname) {
diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index 31e113aa04..fae8fbfc07 100644
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -94,6 +94,27 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name,
  * \li	#ISC_R_NOTFOUND        No match
  */

+isc_result_t
+dns_fwdtable_covers(dns_fwdtable_t *fwdtable, const dns_name_t *name,
+		    dns_name_t *foundname, dns_fwdpolicy_t *policy);
+/*%<
+ * Find the closest matching forwarding entry without attaching it. Copy its
+ * name and policy into the non-NULL outputs. Outputs are unchanged on no match.
+ * The closest entry is used regardless of policy; a more distant ancestor's
+ * policy does not override it.
+ *
+ * Requires:
+ * \li	fwdtable is a valid forwarding table
+ * \li	name is absolute
+ * \li	foundname is NULL or has a dedicated buffer large enough for the result
+ * \li	policy is NULL or points to a dns_fwdpolicy_t
+ *
+ * Returns:
+ * \li	#ISC_R_SUCCESS for an exact match
+ * \li	#DNS_R_PARTIALMATCH for an ancestor match
+ * \li	#ISC_R_NOTFOUND if no covering entry exists
+ */
+
 isc_result_t
 dns_fwdtable_finddeepestonly(dns_fwdtable_t *fwdtable, const dns_name_t *name,
 			     dns_name_t *foundname);
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index ba38d12b98..7efe107d52 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -731,6 +731,17 @@ dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name,
  *\li	#ISC_R_MULTIPLE         Multiple zones with the same name were found.
  */

+bool
+dns_view_containszone(dns_view_t *view, const dns_name_t *name);
+/*%<
+ * Return whether 'view' has a zone with exactly the origin 'name', without
+ * attaching the zone. Includes unloaded mirror zones.
+ *
+ * Requires:
+ * \li	'view' to be valid
+ * \li	'name' to be absolute
+ */
+
 isc_result_t
 dns_view_findzone(dns_view_t *view, const dns_name_t *name,
 		  unsigned int options, dns_zone_t **zonep);
diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
index 1284143ec2..d9d03c8472 100644
--- a/lib/dns/include/dns/zt.h
+++ b/lib/dns/include/dns/zt.h
@@ -105,6 +105,35 @@ dns_zt_find(dns_zt_t *zt, const dns_name_t *name, dns_ztfind_t options,
  * \li	#ISC_R_NOTFOUND
  */

+bool
+dns_zt_contains(dns_zt_t *zt, const dns_name_t *name);
+/*%<
+ * Return whether an exact entry for 'name' exists, without attaching the zone.
+ * Includes unloaded mirror zones.
+ *
+ * Requires:
+ * \li	'zt' to be valid
+ * \li	'name' to be absolute
+ */
+
+isc_result_t
+dns_zt_covers(dns_zt_t *zt, const dns_name_t *name, dns_name_t *foundname);
+/*%<
+ * Copy the origin of the closest enclosing zone, including an exact match,
+ * into 'foundname', without attaching the zone. All zones are considered,
+ * including unloaded mirror zones. On no match, 'foundname' is unchanged.
+ *
+ * Requires:
+ * \li	'zt' to be valid
+ * \li	'name' to be absolute
+ * \li	'foundname' to have a dedicated buffer large enough for the origin
+ *
+ * Returns:
+ * \li	#ISC_R_SUCCESS for an exact match
+ * \li	#DNS_R_PARTIALMATCH for an ancestor match
+ * \li	#ISC_R_NOTFOUND if no covering zone exists
+ */
+
 void
 dns_zt_detach(dns_zt_t **ztp);
 /*%<
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 2a6cf6af2c..1985552e66 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -720,6 +720,23 @@ dns_view_delzone(dns_view_t *view, dns_zone_t *zone) {
 	return result;
 }

+bool
+dns_view_containszone(dns_view_t *view, const dns_name_t *name) {
+	bool found = false;
+	dns_zt_t *zonetable = NULL;
+
+	REQUIRE(DNS_VIEW_VALID(view));
+
+	rcu_read_lock();
+	zonetable = rcu_dereference(view->zonetable);
+	if (zonetable != NULL) {
+		found = dns_zt_contains(zonetable, name);
+	}
+	rcu_read_unlock();
+
+	return found;
+}
+
 isc_result_t
 dns_view_findzone(dns_view_t *view, const dns_name_t *name,
 		  unsigned int options, dns_zone_t **zonep) {
@@ -1889,7 +1906,6 @@ dns_view_sfd_find(dns_view_t *view, const dns_name_t *name,
 		  dns_name_t *foundname) {
 	dns_fixedname_t fcandidate;
 	dns_name_t *candidate = dns_fixedname_initname(&fcandidate);
-	dns_zone_t *zone = NULL;
 	dns_keytable_t *secroots = NULL;
 	dns_zt_t *zonetable = NULL;
 	unsigned int foundlabels = 0;
@@ -1902,16 +1918,14 @@ dns_view_sfd_find(dns_view_t *view, const dns_name_t *name,
 	rcu_read_lock();
 	zonetable = rcu_dereference(view->zonetable);
 	if (zonetable != NULL) {
-		result = dns_zt_find(zonetable, name, 0, &zone);
+		result = dns_zt_covers(zonetable, name, foundname);
 	} else {
 		result = ISC_R_NOTFOUND;
 	}
 	rcu_read_unlock();

 	if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
-		dns_name_copy(dns_zone_getorigin(zone), foundname);
 		foundlabels = dns_name_countlabels(foundname);
-		dns_zone_detach(&zone);
 	}

 	result = dns_fwdtable_finddeepestonly(view->fwdtable, name, candidate);
diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 8722c83902..16bda8b406 100644
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -233,6 +233,43 @@ dns_zt_find(dns_zt_t *zt, const dns_name_t *name, dns_ztfind_t options,
 	return result;
 }

+bool
+dns_zt_contains(dns_zt_t *zt, const dns_name_t *name) {
+	isc_result_t result;
+	dns_qpread_t qpr;
+
+	REQUIRE(VALID_ZT(zt));
+	REQUIRE(dns_name_isabsolute(name));
+
+	dns_qpmulti_query(zt->multi, &qpr);
+	result = dns_qp_getname(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL);
+	dns_qpread_destroy(zt->multi, &qpr);
+
+	return result == ISC_R_SUCCESS;
+}
+
+isc_result_t
+dns_zt_covers(dns_zt_t *zt, const dns_name_t *name, dns_name_t *foundname) {
+	isc_result_t result;
+	dns_qpread_t qpr;
+	void *pval = NULL;
+
+	REQUIRE(VALID_ZT(zt));
+	REQUIRE(dns_name_isabsolute(name));
+	REQUIRE(foundname != NULL);
+
+	dns_qpmulti_query(zt->multi, &qpr);
+	result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
+			       &pval, NULL);
+	if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
+		dns_zone_t *zone = pval;
+		dns_name_copy(dns_zone_getorigin(zone), foundname);
+	}
+	dns_qpread_destroy(zt->multi, &qpr);
+
+	return result;
+}
+
 void
 dns_zt_attach(dns_zt_t *zt, dns_zt_t **ztp) {
 	REQUIRE(VALID_ZT(zt));
diff --git a/tests/dns/zt_test.c b/tests/dns/zt_test.c
index 91dd05706b..f4946e2bd0 100644
--- a/tests/dns/zt_test.c
+++ b/tests/dns/zt_test.c
@@ -66,6 +66,75 @@ count_zone(dns_zone_t *zone, void *uap) {
 	return ISC_R_SUCCESS;
 }

+/* Covering lookups return the closest origin without attaching a zone. */
+ISC_LOOP_TEST_IMPL(covers) {
+	dns_fixedname_t qname, found, expected;
+	dns_name_t *name = dns_fixedname_initname(&qname);
+	dns_name_t *foundname = dns_fixedname_initname(&found);
+	dns_name_t *expectedname = dns_fixedname_initname(&expected);
+	dns_zone_t *zones[2] = { NULL, NULL };
+	dns_zt_t *zt = NULL;
+	const struct {
+		const char *name;
+		const char *origin;
+		isc_result_t result;
+	} cases[] = {
+		{ "example.", "example.", ISC_R_SUCCESS },
+		{ "child.example.", "child.example.", ISC_R_SUCCESS },
+		{ "www.child.example.", "child.example.", DNS_R_PARTIALMATCH },
+		{ "sibling.example.", "example.", DNS_R_PARTIALMATCH },
+		{ "unrelated.", ".", ISC_R_NOTFOUND },
+		{ ".", ".", ISC_R_NOTFOUND },
+	};
+
+	assert_int_equal(dns_test_makeview("view", false, false, &view),
+			 ISC_R_SUCCESS);
+	dns_zt_create(view->mctx, view, &zt);
+	dns_test_namefromstring("example.", &qname);
+	dns_name_copy(dns_rootname, foundname);
+	assert_int_equal(dns_zt_covers(zt, name, foundname), ISC_R_NOTFOUND);
+	assert_true(dns_name_isroot(foundname));
+	assert_false(dns_zt_contains(zt, name));
+
+	assert_int_equal(dns_test_makezone("example", &zones[0], NULL, false),
+			 ISC_R_SUCCESS);
+	assert_int_equal(
+		dns_test_makezone("child.example", &zones[1], NULL, false),
+		ISC_R_SUCCESS);
+	for (size_t i = 0; i < ARRAY_SIZE(zones); i++) {
+		assert_int_equal(dns_zt_mount(zt, zones[i]), ISC_R_SUCCESS);
+	}
+
+	for (size_t i = 0; i < ARRAY_SIZE(cases); i++) {
+		dns_test_namefromstring(cases[i].name, &qname);
+		dns_test_namefromstring(cases[i].origin, &expected);
+		dns_name_copy(dns_rootname, foundname);
+		assert_int_equal(dns_zt_covers(zt, name, foundname),
+				 cases[i].result);
+		assert_true(dns_name_equal(foundname, expectedname));
+		assert_int_equal(dns_zt_contains(zt, name),
+				 cases[i].result == ISC_R_SUCCESS);
+	}
+
+	/* The copied origin remains valid after removing its zone. */
+	dns_test_namefromstring("www.child.example.", &qname);
+	assert_int_equal(dns_zt_covers(zt, name, foundname),
+			 DNS_R_PARTIALMATCH);
+	assert_int_equal(dns_zt_unmount(zt, zones[1]), ISC_R_SUCCESS);
+	dns_zone_detach(&zones[1]);
+	dns_test_namefromstring("child.example.", &expected);
+	assert_true(dns_name_equal(foundname, expectedname));
+	assert_int_equal(dns_zt_covers(zt, name, foundname),
+			 DNS_R_PARTIALMATCH);
+	assert_true(dns_name_equal(foundname, dns_zone_getorigin(zones[0])));
+
+	assert_int_equal(dns_zt_unmount(zt, zones[0]), ISC_R_SUCCESS);
+	dns_zone_detach(&zones[0]);
+	dns_zt_detach(&zt);
+	dns_view_detach(&view);
+	isc_loopmgr_shutdown();
+}
+
 ISC_LOOP_TEST_IMPL(sfd_forward_only_deepest) {
 	dns_fixedname_t child, found, parent, qname;
 	dns_name_t *childname = dns_fixedname_initname(&child);
@@ -74,6 +143,7 @@ ISC_LOOP_TEST_IMPL(sfd_forward_only_deepest) {
 	dns_name_t *parentname = dns_fixedname_initname(&parent);
 	isc_sockaddrlist_t addrs;
 	isc_result_t result;
+	dns_fwdpolicy_t policy = dns_fwdpolicy_none;

 	result = dns_test_makeview("view", false, false, &view);
 	assert_int_equal(result, ISC_R_SUCCESS);
@@ -90,7 +160,41 @@ ISC_LOOP_TEST_IMPL(sfd_forward_only_deepest) {
 				  dns_fwdpolicy_first);
 	assert_int_equal(result, ISC_R_SUCCESS);

+	result = dns_fwdtable_covers(view->fwdtable, parentname, namespace,
+				     &policy);
+	assert_int_equal(result, ISC_R_SUCCESS);
+	assert_true(dns_name_equal(namespace, parentname));
+	assert_int_equal(policy, dns_fwdpolicy_only);
+
+	result = dns_fwdtable_covers(view->fwdtable, childname, namespace,
+				     &policy);
+	assert_int_equal(result, ISC_R_SUCCESS);
+	assert_true(dns_name_equal(namespace, childname));
+	assert_int_equal(policy, dns_fwdpolicy_first);
+
+	dns_test_namefromstring("unrelated.", &qname);
+	result = dns_fwdtable_covers(view->fwdtable, name, namespace, &policy);
+	assert_int_equal(result, ISC_R_NOTFOUND);
+	assert_true(dns_name_equal(namespace, childname));
+	assert_int_equal(policy, dns_fwdpolicy_first);
+
 	dns_test_namefromstring("www.child.example.", &qname);
+	result = dns_fwdtable_covers(view->fwdtable, name, namespace, &policy);
+	assert_int_equal(result, DNS_R_PARTIALMATCH);
+	assert_true(dns_name_equal(namespace, childname));
+	assert_int_equal(policy, dns_fwdpolicy_first);
+	assert_int_equal(dns_fwdtable_covers(view->fwdtable, name, NULL, NULL),
+			 DNS_R_PARTIALMATCH);
+	policy = dns_fwdpolicy_none;
+	assert_int_equal(
+		dns_fwdtable_covers(view->fwdtable, name, NULL, &policy),
+		DNS_R_PARTIALMATCH);
+	assert_int_equal(policy, dns_fwdpolicy_first);
+	assert_int_equal(
+		dns_fwdtable_covers(view->fwdtable, name, namespace, NULL),
+		DNS_R_PARTIALMATCH);
+	assert_true(dns_name_equal(namespace, childname));
+
 	dns_view_sfd_find(view, name, namespace);
 	assert_true(dns_name_equal(namespace, parentname));

@@ -324,6 +428,7 @@ ISC_LOOP_TEST_IMPL(asyncload_zt) {
 }

 ISC_TEST_LIST_START
+ISC_TEST_ENTRY_CUSTOM(covers, setup_managers, teardown_managers)
 ISC_TEST_ENTRY_CUSTOM(sfd_forward_only_deepest, setup_managers, teardown_test)
 ISC_TEST_ENTRY_CUSTOM(sfd_secroots_boundary, setup_managers, teardown_test)
 ISC_TEST_ENTRY_CUSTOM(apply, setup_managers, teardown_test)