From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 26 Oct 1999 22:29:47 +0000 (+0000)
Subject: Add more shortcircuits (for $$ cases)
X-Git-Tag: UCDATA_2_4~321
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ec43c31bab5c343bd3b930829a695e9dcd2f15e;p=openldap

Add more shortcircuits (for $$ cases)
---

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 2180a120c1..7f008dfd03 100644
--- 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( "*" );