From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 3 Sep 2008 02:48:03 +0000 (+0000)
Subject: ITS#5627
X-Git-Tag: OPENLDAP_REL_ENG_2_4_12~93
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=67be96ea6394bfc7342cac1629a0ff818aa435f9;p=openldap

ITS#5627
---

diff --git a/CHANGES b/CHANGES
index b842d0e107..322442f6b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,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 aci's with sets (ITS#5627)
 	Fixed slapd custom attribute inheritance (ITS#5642)
 	Fixed slapd dynacl mask handling (ITS#5637)
 	Fixed slapd firstComponentMatch normalization (ITS#5634)
diff --git a/servers/slapd/aci.c b/servers/slapd/aci.c
index ee3c38f68d..de0b6c6ac3 100644
--- a/servers/slapd/aci.c
+++ b/servers/slapd/aci.c
@@ -1743,6 +1743,12 @@ OpenLDAPaciPrettyNormal(
 		}
 
 		nsubject = ad->ad_cname;
+
+	} else if ( OpenLDAPacitypes[ idx ] == &aci_bv[ ACI_BV_SET ]
+		|| OpenLDAPacitypes[ idx ] == &aci_bv[ ACI_BV_SET_REF ] )
+	{
+		/* NOTE: dunno how to normalize it... */
+		nsubject = subject;
 	}