From 64bd596b0bcd14d4fe8eb7d3cc0213f07d099b5a Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Jun 18 2008 11:37:44 +0000
Subject: - parse inner acls correctly (#450995)


---

diff --git a/bind.spec b/bind.spec
index 3685653..ba81fe3 100644
--- a/bind.spec
+++ b/bind.spec
@@ -18,7 +18,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	27.1%{?dist}
+Release: 	27.2%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,7 @@ Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch80:	bind-9.5-edns.patch
 Patch88:	bind-9.5-recv-race.patch
+Patch89:	bind95-rh450995.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -247,6 +248,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %patch83 -p1 -b .libidn2
 %patch85 -p1 -b .libidn3
 %patch88 -p1 -b .recv-race
+%patch89 -p1 -b .rh450995
 :;
 
 
@@ -403,7 +405,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.246 2008/05/29 17:58:54 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.247 2008/06/18 11:37:44 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -662,6 +664,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Jun 18 2008 Adam Tkac <atkac redhat com> 32:9.5.0-27.2
+- parse inner acls correctly (#450995)
+
 * Thu May 29 2008 Adam Tkac <atkac redhat com> 32:9.5.0-27.1
 - 9.5.0 final
 - bind-9.5-initialize.patch merged to upstream
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;
+ 			}