Import ACL to dn="" bug fix (ITS#1921)

diff --git a/CHANGES b/CHANGES
index ebf47b7f408722d1b6e69b2851555fcc01062484..0d9a65f04d260b858079b32abe0aec0330dd8313 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.1 Change Log
 
 OpenLDAP 2.1.3 Release
+       Fixed slapd access to dn="" bug (ITS#1921)
        Fixed slapd structuralObjectClass lastmod bug (ITS#1904)
        Fixed slapd krbName bug (ITS#1913)
        Fixed slapd schema error alignment bug

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 46159d21563a4ae45032583586c4270b58c2cbda..2318cbffd508eebd7ba923c6b51f691271f395ce 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -395,7 +395,7 @@ acl_get(
        for ( ; a != NULL; a = a->acl_next ) {
                (*count) ++;
 
-               if (a->acl_dn_pat.bv_len != 0) {
+               if ( a->acl_dn_pat.bv_len || ( a->acl_dn_style != ACL_STYLE_REGEX )) {
                        if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index f53d273aa6373e5edbb946b996a252555962bea1..02703af4706bfa0f80dd51d884936b0a7a77f6db 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -118,7 +118,9 @@ parse_acl(
                                }
 
                                if ( strcasecmp( argv[i], "*" ) == 0 ) {
-                                       if( a->acl_dn_pat.bv_len != 0 ) {
+                                       if( a->acl_dn_pat.bv_len ||
+                                               ( a->acl_dn_style != ACL_STYLE_REGEX ) )
+                                       {
                                                fprintf( stderr,
                                                        "%s: line %d: dn pattern"
                                                        " already specified in to clause.\n",
@@ -142,7 +144,9 @@ parse_acl(
                                }
 
                                if ( strcasecmp( left, "dn" ) == 0 ) {
-                                       if( a->acl_dn_pat.bv_len != 0 ) {
+                                       if( a->acl_dn_pat.bv_len != 0 ||
+                                               ( a->acl_dn_style != ACL_STYLE_REGEX ) )
+                                       {
                                                fprintf( stderr,
                                                        "%s: line %d: dn pattern"
                                                        " already specified in to clause.\n",
@@ -230,7 +234,9 @@ parse_acl(
                                a->acl_dn_pat.bv_len = 0;
                        }
                        
-                       if( a->acl_dn_pat.bv_len != 0 ) {
+                       if( a->acl_dn_pat.bv_len != 0 ||
+                               ( a->acl_dn_style != ACL_STYLE_REGEX ) )
+                       {
                                if ( a->acl_dn_style != ACL_STYLE_REGEX ) {
                                        struct berval bv;
                                        rc = dnNormalize2( NULL, &a->acl_dn_pat, &bv);

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index d04ae6b4d2b64f9ba4e71ad3421a2f0d2f5b4a2a..81cfba6d7646b35fa8aee5fa6656e354ae90ee0d 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -34,6 +34,9 @@ rootpw                secret
 # cn=monitor, cn=schema, and cn=config
 #
 
+access to dn="" by * read
+access to dn.base="" by * read
+
 access         to attr=objectclass
                by * =rsc stop