Zone transfers should honour -4 and -6 options

Check if the address family has been disabled when transferring
zones.

(cherry picked from commit ecdde04e63277e2bed8d1d861470de80ab0f49e1)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 8b97304c6f03768760ea664b4f37989cc45321a4..8a6013b5c67a1f82f3ce0fb23a2ff0988774f333 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -14464,8 +14464,12 @@ again:
        INSIST(zone->curprimary < zone->primariescnt);
 
        zone->primaryaddr = zone->primaries[zone->curprimary];
-
        isc_netaddr_fromsockaddr(&primaryip, &zone->primaryaddr);
+
+       if (isc_sockaddr_disabled(&zone->primaryaddr)) {
+               goto skip_primary;
+       }
+
        /*
         * First, look for a tsig key in the primaries statement, then
         * try for a server key.