From a7b4be5b3372758611a72633565071360d9c23e8 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 28 Nov 2008 23:15:03 +0000
Subject: [PATCH] fix ACI as a consequence of ITS#5804 (this is a hack; would
 need an API change)

---
 servers/slapd/aci.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/servers/slapd/aci.c b/servers/slapd/aci.c
index 88232f33e5..5691bbc817 100644
--- a/servers/slapd/aci.c
+++ b/servers/slapd/aci.c
@@ -400,11 +400,15 @@ aci_group_member (
 	if ( grp_oc != NULL && grp_ad != NULL ) {
 		char		buf[ ACI_BUF_SIZE ];
 		struct berval	bv, ndn;
+		AclRegexMatches amatches = { 0 };
+
+		amatches.dn_count = nmatch;
+		AC_MEMCPY( amatches.dn_data, matches, sizeof( amatches.dn_data ) );
 
 		bv.bv_len = sizeof( buf ) - 1;
 		bv.bv_val = (char *)&buf;
 		if ( acl_string_expand( &bv, &subjdn,
-				e->e_ndn, nmatch, matches ) )
+				&e->e_nname, NULL, &amatches ) )
 		{
 			rc = LDAP_OTHER;
 			goto done;