Add more shortcircuits (for $$ cases)

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 2180a120c10abfd375ff34693b89f9c75871fb1e..7f008dfd0300248efd09249c2de6280b5c7bb778 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -156,7 +156,9 @@ parse_acl(
                                                || strcmp(right, ".*") == 0 
                                                || strcmp(right, ".*$") == 0 
                                                || strcmp(right, "^.*") == 0 
-                                               || strcmp(right, "^.*$") == 0 )
+                                               || strcmp(right, "^.*$$") == 0
+                                               || strcmp(right, ".*$$") == 0 
+                                               || strcmp(right, "^.*$$") == 0 )
                                        {
                                                a->acl_dn_pat = ch_strdup( "*" );
 
@@ -274,14 +276,18 @@ parse_acl(
                                        } else if ( strcmp( right, ".+" ) == 0
                                                || strcmp( right, "^.+" ) == 0
                                                || strcmp( right, ".+$" ) == 0
-                                               || strcmp( right, "^.+$" ) == 0 )
+                                               || strcmp( right, "^.+$" ) == 0
+                                               || strcmp( right, ".+$$" ) == 0
+                                               || strcmp( right, "^.+$$" ) == 0 )
                                        {
                                                pat = ch_strdup( "users" );
 
                                        } else if ( strcmp( right, ".*" ) == 0
                                                || strcmp( right, "^.*" ) == 0
                                                || strcmp( right, ".*$" ) == 0
-                                               || strcmp( right, "^.*$" ) == 0 )
+                                               || strcmp( right, "^.*$" ) == 0
+                                               || strcmp( right, ".*$$" ) == 0
+                                               || strcmp( right, "^.*$$" ) == 0 )
                                        {
                                                pat = ch_strdup( "*" );