rpms/bind/F-9 bind95-rh450995.patch,NONE,1.1 bind.spec,1.263,1.264

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2155

Modified Files:
	bind.spec 
Added Files:
	bind95-rh450995.patch 
Log Message:
- parse inner acls correctly (#450995)


bind95-rh450995.patch:

--- NEW FILE bind95-rh450995.patch ---
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;
 			}


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- bind.spec	29 May 2008 17:54:52 -0000	1.263
+++ bind.spec	18 Jun 2008 11:34:31 -0000	1.264
@@ -16,7 +16,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	32.1%{?dist}
+Release: 	32.2%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,7 @@
 Patch87:	bind-9.5-parallel-build.patch
 Patch91:	bind-9.5-recv-race.patch
 Patch92:	bind-9.5-edns.patch
+Patch93:	bind95-rh450995.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -237,6 +238,7 @@
 %patch87 -p1 -b .parallel
 %patch91 -p1 -b .recv-race
 %patch92 -p1 -b .edns
+%patch93 -p1 -b .rh450995
 :;
 
 
@@ -642,6 +644,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Jun 18 2008 Adam Tkac <atkac redhat com> 32:9.5.0-32.2
+- parse inner acls correctly (#450995)
+
 * Thu May 29 2008 Adam Tkac <atkac redhat com> 32:9.5.0-32.1
 - 9.5.0 final
 - bind-9.5-initialize.patch merged to upstream