From fc7043d7d1294478c9988c10af9a7fb8fd810338 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 22 Jan 2008 05:37:49 +0000
Subject: [PATCH] Used incorrect address family for mapped IPv4 addresses in
 acl.c. [RT #17519]

---
 CHANGES       | 3 +++
 lib/dns/acl.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 48ac9983a9..5c54ea3341 100644
--- 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 f8326168ca..fd91a4e923 100644
--- 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);