From: Rein Tollevik <rein@openldap.org>
Date: Tue, 23 Jun 2009 21:17:57 +0000 (+0000)
Subject: ITS#6179 Don't require dn.regex in <who> to use expand style in <by>.
X-Git-Tag: ACLCHECK_0~485
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9d4ea6378b8bc82bd727e9a586f2162b6952caeb;p=openldap

ITS#6179 Don't require dn.regex in <who> to use expand style in <by>.
---

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 19db97fea0..3f0e381722 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -851,16 +851,6 @@ parse_acl(
 					}
 				}
 
-				/* expand in <who> needs regex in <what> */
-				if ( ( sty == ACL_STYLE_EXPAND || expand )
-						&& a->acl_dn_style != ACL_STYLE_REGEX )
-				{
-					Debug( LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL, "%s: line %d: \"expand\" style "
-						"or modifier used in conjunction with a non-regex <what> clause.\n",
-						fname, lineno, 0 );
-						goto fail;
-				}
-
 				if ( strncasecmp( left, "real", STRLENOF( "real" ) ) == 0 ) {
 					is_realdn = 1;
 					bdn = &b->a_realdn;