From 7bef2ffdf685b447b8a94fd878e0d5ec2424b36c Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 9 Aug 2008 12:26:17 +0000
Subject: [PATCH] optimize ACI check (ITS#5636)

---
 servers/slapd/aci.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/servers/slapd/aci.c b/servers/slapd/aci.c
index 580590f122..ee3c38f68d 100644
--- a/servers/slapd/aci.c
+++ b/servers/slapd/aci.c
@@ -345,9 +345,12 @@ aci_list_get_rights(
 			continue;
 		}
 
-		found = 1;
 		*mask |= aci_list_get_attr_rights( &perm, attr, val );
 		*mask |= aci_list_get_attr_rights( &perm, &aci_bv[ ACI_BV_BR_ALL ], NULL );
+
+		if ( *mask != ACL_PRIV_NONE ) { 
+			found = 1;
+		}
 	}
 
 	return found;
@@ -439,7 +442,9 @@ aci_mask(
 				opts,
 				sdn;
 	int			rc;
-		
+
+	ACL_INIT( *grant );
+	ACL_INIT( *deny );
 
 	assert( !BER_BVISNULL( &desc->ad_cname ) );
 
-- 
2.39.5