From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 20 Dec 2005 18:30:08 +0000 (+0000)
Subject: ITS#4255: ACL "exact" attrval clause needs normalized value
X-Git-Tag: OPENLDAP_REL_ENG_2_3_14~51
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d90872406444c78902458f3e3451287df0abddc6;p=openldap

ITS#4255: ACL "exact" attrval clause needs normalized value
---

diff --git a/CHANGES b/CHANGES
index 135ce65777..f5c4e89848 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,9 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.14 Engineering
 	Fixed slapd sc_prev update after free bug (ITS#4237)
-	Fixed slapd-meta sizelimit disclose issue (ITS#4213)
 	Fixed slapo-rwm static DN free bug (ITS#4248)
 	Fixed slapd assertion control restrictions
+	Fixed slapd ACL exact attrval clause needs normalization (ITS#4255)
 
 OpenLDAP 2.3.13 Release
 	Fixed libldap/liblutil MSG_ACCRIGHTSLEN bug (ITS#4206)
diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 48d5eb7f14..e4a2b8f169 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -885,7 +885,7 @@ slap_acl_get(
 	
 				if ( a->acl_attrs[0].an_desc->ad_type->sat_syntax != slap_schema.si_syn_distinguishedName ) {
 					if (value_match( &match, desc,
-						/* desc->ad_type->sat_equality */ a->acl_attrval_mr, 0,
+						a->acl_attrval_mr, 0,
 						val, &a->acl_attrval, &text ) != LDAP_SUCCESS ||
 							match )
 						continue;
@@ -925,7 +925,7 @@ slap_acl_get(
 							continue;
 					}
 	
-					if ( strcmp( a->acl_attrval.bv_val, val->bv_val + vdnlen - patlen ))
+					if ( strcmp( a->acl_attrval.bv_val, val->bv_val + vdnlen - patlen ) )
 						continue;
 				}
 			}