From 20b9c8fe2aa142aab8aa15cd5e766610d9734e8d Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Wed, 18 Jun 2008 11:21:14 +0000
Subject: [PATCH] - parse inner acls correctly (#450995)

---
 bind.spec             |  7 ++++++-
 bind95-rh450995.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 bind95-rh450995.patch

diff --git a/bind.spec b/bind.spec
index 58a8615..d0288f7 100644
--- a/bind.spec
+++ b/bind.spec
@@ -16,7 +16,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.5.0
-Release:  36.1%{dist}
+Release:  36.2%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,7 @@ Patch72: bind-9.5-dlz-64bit.patch
 Patch87: bind-9.5-parallel-build.patch
 Patch89: bind-9.5-recv-race.patch
 Patch90: bind-9.5-edns.patch
+Patch91: bind95-rh450995.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -238,6 +239,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %patch87 -p1 -b .parallel
 %patch89 -p1 -b .recv-race
 %patch90 -p1 -b .edns
+%patch91 -p1 -b .rh450995
 :;
 
 
@@ -634,6 +636,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Jun 18 2008 Adam Tkac <atkac redhat com> 32:9.5.0-36.2
+- parse inner acls correctly (#450995)
+
 * Mon Jun 02 2008 Adam Tkac <atkac redhat com> 32:9.5.0-36.1
 - removed dns-keygen utility in favour of rndc-confgen -a (#449287)
 - some minor sample fixes (#449274)
diff --git a/bind95-rh450995.patch b/bind95-rh450995.patch
new file mode 100644
index 0000000..d8f7115
--- /dev/null
+++ b/bind95-rh450995.patch
@@ -0,0 +1,11 @@
+diff -up bind-9.5.0/lib/isccfg/aclconf.c.450995 bind-9.5.0/lib/isccfg/aclconf.c
+--- bind-9.5.0/lib/isccfg/aclconf.c.450995	2008-06-18 12:29:05.000000000 +0200
++++ bind-9.5.0/lib/isccfg/aclconf.c	2008-06-18 12:30:01.000000000 +0200
+@@ -287,6 +287,7 @@ nested_acl:
+ 			} else {
+ 				dns_acl_merge(dacl, inneracl,
+ 					      ISC_TF(!neg));
++				de += inneracl->length;  /* elements added */
+ 				dns_acl_detach(&inneracl);
+ 				continue;
+ 			}