Patch: Delete the buggy surrogate parent code (ITS#1815)

[openldap] / servers / slapd / aclparse.c

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index f53d273aa6373e5edbb946b996a252555962bea1..80ffa377bff833f7edb82b533cde964a7cec5bd1 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -17,6 +17,7 @@
 
 #include "slap.h"
 #include "lber_pvt.h"
+#include "lutil.h"
 
 static void            split(char *line, int splitchar, char **left, char **right);
 static void            access_append(Access **l, Access *a);
@@ -118,7 +119,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 +145,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",
@@ -197,8 +202,7 @@ parse_acl(
                                }
 
                                if ( strcasecmp( left, "filter" ) == 0 ) {
-                                       if ( (a->acl_filter = str2filter(
-                                           right )) == NULL ) {
+                                       if ( (a->acl_filter = str2filter( right )) == NULL ) {
                                                fprintf( stderr,
                                "%s: line %d: bad filter \"%s\" in to clause\n",
                                                    fname, lineno, right );
@@ -223,14 +227,16 @@ parse_acl(
                        }
 
                        if ( a->acl_dn_pat.bv_len != 0 &&
-                               strcmp(a->acl_dn_pat.bv_val, "*") == 0)
+                               strcmp(a->acl_dn_pat.bv_val, "*") == 0 )
                        {
                                free( a->acl_dn_pat.bv_val );
                                a->acl_dn_pat.bv_val = NULL;
                                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);
@@ -1101,24 +1107,24 @@ accessmask2str( slap_mask_t mask, char *buf )
 
        if ( ACL_IS_LEVEL( mask ) ) {
                if ( ACL_LVL_IS_NONE(mask) ) {
-                       ptr = slap_strcopy( ptr, "none" );
+                       ptr = lutil_strcopy( ptr, "none" );
 
                } else if ( ACL_LVL_IS_AUTH(mask) ) {
-                       ptr = slap_strcopy( ptr, "auth" );
+                       ptr = lutil_strcopy( ptr, "auth" );
 
                } else if ( ACL_LVL_IS_COMPARE(mask) ) {
-                       ptr = slap_strcopy( ptr, "compare" );
+                       ptr = lutil_strcopy( ptr, "compare" );
 
                } else if ( ACL_LVL_IS_SEARCH(mask) ) {
-                       ptr = slap_strcopy( ptr, "search" );
+                       ptr = lutil_strcopy( ptr, "search" );
 
                } else if ( ACL_LVL_IS_READ(mask) ) {
-                       ptr = slap_strcopy( ptr, "read" );
+                       ptr = lutil_strcopy( ptr, "read" );
 
                } else if ( ACL_LVL_IS_WRITE(mask) ) {
-                       ptr = slap_strcopy( ptr, "write" );
+                       ptr = lutil_strcopy( ptr, "write" );
                } else {
-                       ptr = slap_strcopy( ptr, "unknown" );
+                       ptr = lutil_strcopy( ptr, "unknown" );
                }
                
                *ptr++ = '(';