Bypasss regex for access to dn="" ACL

diff --git a/CHANGES b/CHANGES
index 486bc964551272e1ee2ced4303c40bc12a76504d..21e793cb2bcd86d5b014b2ddf31250a07758ba3c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 OpenLDAP 2.0 Change Log
 
+OpenLDAP 2.0.23 Engineering
+       Fixed slapd moddn acl bug (ITS#1562) (ITS#1582)
+       Fixed slapd acl regex (to dn="") portability bug (ITS#1579)
+       Documentation
+               Fixed a number of typos (ITS#1578)
+
 OpenLDAP 2.0.22 Release
        Fixed slapd passwd modify referral bug
        Fixed back-ldbm index threading bug

diff --git a/build/version b/build/version
index b6673c6522f94b53b7149d243ca29380c00c2273..3e61af0c59ce2c7a6ad183ca971cf937e7a19790 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.22-Release
+2.0.23-Release

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 524cd2529352992d40fa6c24515605b41ba10ce4..9f71eb1ce86fddb0ede5ed7b82bdc1dbd549b1d9 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -156,7 +156,12 @@ parse_acl(
                                                || strcasecmp( style, "regex" ) == 0 )
                                        {
                                                a->acl_dn_style = ACL_STYLE_REGEX;
-                                               if ( strcmp(right, "*") == 0 
+
+                                               if ( *right == '\0' ) {
+                                                       a->acl_dn_style = ACL_STYLE_BASE;
+                                                       a->acl_dn_pat = ch_strdup( right );
+
+                                               } else if ( strcmp(right, "*") == 0 
                                                        || strcmp(right, ".*") == 0 
                                                        || strcmp(right, ".*$") == 0 
                                                        || strcmp(right, "^.*") == 0