From: Evan Hunt <each@isc.org>
Date: Tue, 29 Apr 2008 01:04:14 +0000 (+0000)
Subject: Fix a bug causing dns_acl_isany() to return spurious results [rt18000]
X-Git-Tag: v9.5.0rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b499d30ab72334290db6a2c27c06a494b6e9825;p=thirdparty%2Fbind9.git

Fix a bug causing dns_acl_isany() to return spurious results [rt18000]
---

diff --git a/CHANGES b/CHANGES
index 3ee3b3ed55f..34876ea2fa0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2365.   [bug]           Fix an bug that caused dns_acl_isany() to return
+                        spurious results. [RT #18000]
+
 2364.	[bug]		named could trigger a assertion when serving a
 			malformed signed zone. [RT #17828]
 
@@ -6,7 +9,7 @@
 
 2362.   [cleanup]       Make "rrset-order fixed" a compile-time option.
                         settable by "./configure --enable-fixed-rrset".
-                        Disabled by default. [rt17977]
+                        Disabled by default. [RT #17977]
 
 2361.	[bug]		"recursion" statistics counter could be counted
 			multiple times for a single query.  [RT #17990]
diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index d8d0b9bcfa3..bb54a8a319e 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.c,v 1.37.2.6 2008/01/27 02:12:51 marka Exp $ */
+/* $Id: acl.c,v 1.37.2.7 2008/04/29 01:04:14 each Exp $ */
 
 /*! \file */
 
@@ -148,7 +148,7 @@ dns_acl_isanyornone(dns_acl_t *acl, isc_boolean_t pos)
 		return (ISC_FALSE);
 
 	if (acl->iptable->radix->head->prefix->bitlen == 0 &&
-	    *(isc_boolean_t *) (acl->iptable->radix->head->data) == pos)
+	    *(isc_boolean_t *) (acl->iptable->radix->head->data[0]) == pos)
 		return (ISC_TRUE);
 
 	return (ISC_FALSE); /* All others */