From 69dde597b9874a76af25a96d3126b9b8c7a3c307 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 30 Nov 2023 16:46:50 +1100
Subject: [PATCH] Don't do DS checks over disabled address families

(cherry picked from commit 05472e63e8930753d7fa8d3bbf840be2085a2f23)
---
 lib/dns/zone.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 6419bd410a..cf71477964 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6392,6 +6392,8 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
 		goto unlock;
 	}
 
+	report_no_active_addresses(zone, parentals, count, "parental-agents");
+
 	/*
 	 * Now set up the parentals and parental key lists
 	 */
@@ -21800,6 +21802,16 @@ checkds_send(dns_zone_t *zone) {
 
 		dst = zone->parentals[i];
 
+		if (isc_sockaddr_disabled(&dst)) {
+			if (key != NULL) {
+				dns_tsigkey_detach(&key);
+			}
+			if (transport != NULL) {
+				dns_transport_detach(&transport);
+			}
+			continue;
+		}
+
 		/* TODO: glue the transport to the checkds request */
 
 		if (checkds_isqueued(zone, &dst, key, transport)) {
@@ -21827,6 +21839,12 @@ checkds_send(dns_zone_t *zone) {
 				     "checkds: create DS query for "
 				     "parent %d failed",
 				     i);
+			if (key != NULL) {
+				dns_tsigkey_detach(&key);
+			}
+			if (transport != NULL) {
+				dns_transport_detach(&transport);
+			}
 			continue;
 		}
 		zone_iattach(zone, &checkds->zone);