ITS#6179

diff --git a/CHANGES b/CHANGES
index 0cce6634aca486efecc8a6a27aba84da0d5dadf4..feadc798f3c91e6ea97938b6ca1fc3d830cc78e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.17 Engineering
        Added slapd schema checking tool (ITS#6150)
        Added slapd writetimeout keyword (ITS#5836)
        Fixed slapd abandon/cancel handling for some ops (ITS#6157)
+       Fixed slapd access setstyle to expand (ITS#6179)
        Fixed slapd assert with closing connections (ITS#6111)
        Fixed slapd cancel behavior (ITS#6137)
        Fixed slapd cert validation (ITS#6098)
@@ -64,6 +65,7 @@ OpenLDAP 2.4.17 Engineering
                ldapwhoami(1) note -e option (ITS#6107)
                ldap_result(3) Add RETURN VALUE heading (ITS#6180)
                ldap.conf(5) improve sizelimit/timelimit limits (ITS#6127)
+               slapd.access(5) Fix <setstyle> to use expand (ITS#6179)
                slapd.conf(5) pidfile/argsfile description fix (ITS#5975)
                slapd-config(5) pidfile/argsfile description fix (ITS#5975)
                slapo-constraint(5) clarify URI example (ITS#6118)

diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5
index 0844defd7aed0a1c412e6d183f142e03b1353e02..a88cb9c285f1f7c8e9e4155b9c5d9b661e6c2c0a 100644 (file)
--- a/doc/man/man5/slapd.access.5
+++ b/doc/man/man5/slapd.access.5
@@ -310,7 +310,7 @@ with
        <groupstyle>={exact|expand}
        <peernamestyle>={<style>|ip|ipv6|path}
        <domainstyle>={exact|regex|sub(tree)}
-       <setstyle>={exact|regex}
+       <setstyle>={exact|expand}
        <modifier>={expand}
        <name>=aci              <pattern>=<attrname>]
 .fi

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 19db97fea04dcc1efd1df33d9521f5941a4fbea8..3f0e3817228ae1c2b5955c592693aa0eac31fb4a 100644 (file)
--- 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;