From: Howard Chu <hyc@openldap.org>
Date: Thu, 30 Jan 2003 20:59:47 +0000 (+0000)
Subject: ITS#2285 string_expand for acl set
X-Git-Tag: NO_SLAP_OP_BLOCKS~467
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cbf7b063e36c59ab09eede494d597ae4a0f854b1;p=openldap

ITS#2285 string_expand for acl set
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 50511134b1..20935cad3d 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -982,7 +982,16 @@ dn_match_cleanup:;
 		}
 
 		if ( b->a_set_pat.bv_len != 0 ) {
-			if (aci_match_set( &b->a_set_pat, be, e, conn, op, 0 ) == 0) {
+			struct berval bv;
+			char buf[ACL_BUF_SIZE];
+			if( b->a_set_style == ACL_STYLE_REGEX ){
+				bv.bv_len = sizeof(buf) - 1;
+				bv.bv_val = buf;
+				string_expand( &bv, &b->a_set_pat, e->e_ndn, matches );
+			}else{
+				bv = b->a_set_pat;
+			}
+			if (aci_match_set( &bv, be, e, conn, op, 0 ) == 0) {
 				continue;
 			}
 		}