Don't forward UPDATE messages over disabled address families

(cherry picked from commit d026dbe5367df775fdc22a3e05c63710499dcf07)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index d5aff4f5885ed9e7375cac368df3696de3f280e2..6419bd410ac91a03fd3e95180d23478741f8770f 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -18631,12 +18631,19 @@ sendtoprimary(dns_forward_t *forward) {
                return (ISC_R_CANCELED);
        }
 
+next:
        if (forward->which >= forward->zone->primariescnt) {
                UNLOCK_ZONE(forward->zone);
                return (ISC_R_NOMORE);
        }
 
        forward->addr = forward->zone->primaries[forward->which];
+
+       if (isc_sockaddr_disabled(&forward->addr)) {
+               forward->which++;
+               goto next;
+       }
+
        /*
         * Always use TCP regardless of whether the original update
         * used TCP.