Used incorrect address family for mapped IPv4 addresses in acl.c. [RT #17519]

diff --git a/CHANGES b/CHANGES
index 48ac9983a9fb5058feaf3305076fb737e72dabc2..5c54ea334107742b8710e544fc67dcefe641ab53 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2315.   [bug]           Used incorrect address family for mapped IPv4
+                        addresses in acl.c. [RT #17519]
+
 2314.  [bug]           Uninitialized memory use on error path in
                        bin/named/lwdnoop.c.  [RT #17476]
 

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index f8326168cabbd565ed2a03d8cdd8b73118182043..fd91a4e923f50631c1e1f8556d8e1911edfe9883 100644 (file)
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.c,v 1.42 2008/01/21 23:46:56 tbox Exp $ */
+/* $Id: acl.c,v 1.43 2008/01/22 05:37:49 each Exp $ */
 
 /*! \file */
 
@@ -208,7 +208,7 @@ dns_acl_match(const isc_netaddr_t *reqaddr,
        }
 
        /* Always match with host addresses. */
-       family = reqaddr->family;
+       family = addr->family;
        bitlen = family == AF_INET6 ? 128 : 32;
        NETADDR_TO_PREFIX_T(addr, pfx, bitlen);