From: Quanah Gibson-Mount Date: Wed, 3 Sep 2008 02:40:34 +0000 (+0000) Subject: ITS#5636 X-Git-Tag: OPENLDAP_REL_ENG_2_4_12~95 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7badd4248a1d6ea276979f398baca128630fcff8;p=openldap ITS#5636 --- diff --git a/CHANGES b/CHANGES index 24d0afb4cf..58559af152 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log OpenLDAP 2.4.12 Engineering Fixed liblutil executables on Windows (ITS#5604) + Fixed slapd aci performance (ITS#5636) Fixed slapd custom attribute inheritance (ITS#5642) Fixed slapd firstComponentMatch normalization (ITS#5634) Fixed slapd overlay control registration (ITS#5649) 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 ) );