ITS#5627

diff --git a/CHANGES b/CHANGES
index b842d0e10771dfc6b6e8ae23fbea4b12a7155c08..322442f6b04fad58767421d3fc24440e4009d2c7 100644 (file)
--- 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 ee3c38f68dbf74d9589c153556cec964a001192c..de0b6c6ac39703bdd39eb0d180877c0572f5ed5e 100644 (file)
--- 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;
        }