X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Faclparse.c;h=00c93c23b1ea036d99c88214c4cd57981883ffd9;hb=0f30fb0d8f0adbbb7b41fd455c57aa56d64c9853;hp=8724c9a400ea7484b3d98841ae5543bc8f418df6;hpb=0dbaf87730ec9afe44dceaa452ae51e1dcaac3e7;p=openldap

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 8724c9a400..00c93c23b1 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -1,7 +1,7 @@
 /* aclparse.c - routines to parse and check acl's */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -21,6 +21,8 @@ static void		split(char *line, int splitchar, char **left, char **right);
 static void		access_append(Access **l, Access *a);
 static void		acl_usage(void) LDAP_GCCATTR((noreturn));
 
+static char 		*acl_regex_normalized_dn(const char *pattern);
+
 #ifdef LDAP_DEBUG
 static void		print_acl(Backend *be, AccessControl *a);
 static void		print_access(Access *b);
@@ -92,15 +94,11 @@ parse_acl(
 )
 {
 	int		i;
-	char		*left, *right;
+	char		*left, *right, *style;
 	AccessControl	*a;
 	Access	*b;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	int rc;
-	char *text;
-	static AttributeDescription *member = NULL;
-	static AttributeDescription *aci = NULL;
-#endif
+	const char *text;
 
 	a = NULL;
 	for ( i = 1; i < argc; i++ ) {
@@ -138,6 +136,14 @@ parse_acl(
 				}
 
 				split( argv[i], '=', &left, &right );
+				split( left, '.', &left, &style );
+
+				if ( right == NULL ) {
+					fprintf( stderr,
+	"%s: line %d: missing \"=\" in \"%s\" in to clause\n",
+					    fname, lineno, left );
+					acl_usage();
+				}
 
 				if ( strcasecmp( left, "dn" ) == 0 ) {
 					if( a->acl_dn_pat != NULL ) {
@@ -148,40 +154,49 @@ parse_acl(
 						acl_usage();
 					}
 
-					if ( right == NULL ) {
-						fprintf( stderr,
-	"%s: line %d: missing \"=\" in \"%s\" in to clause\n",
-						    fname, lineno, left );
-						acl_usage();
-					}
+					if ( style == NULL || *style == '\0'
+						|| strcasecmp( style, "regex" ) == 0 )
+					{
+						a->acl_dn_style = ACL_STYLE_REGEX;
+						if ( 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( "*" );
+
+						} else {
+							a->acl_dn_pat = acl_regex_normalized_dn( right );
+						}
+					} else if ( strcasecmp( style, "base" ) == 0 ) {
+						a->acl_dn_style = ACL_STYLE_BASE;
+						a->acl_dn_pat = ch_strdup( right );
 
-					if( *right == '\0' ) {
-						a->acl_dn_pat = ch_strdup("^$");
+					} else if ( strcasecmp( style, "one" ) == 0 ) {
+						a->acl_dn_style = ACL_STYLE_ONE;
+						a->acl_dn_pat = ch_strdup( right );
 
-					} else if ( 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( "*" );
+					} else if ( strcasecmp( style, "subtree" ) == 0 ) {
+						a->acl_dn_style = ACL_STYLE_SUBTREE;
+						a->acl_dn_pat = ch_strdup( right );
 
-					} else {
+					} else if ( strcasecmp( style, "children" ) == 0 ) {
+						a->acl_dn_style = ACL_STYLE_CHILDREN;
 						a->acl_dn_pat = ch_strdup( right );
+
+					} else {
+						fprintf( stderr,
+	"%s: line %d: unknown dn style \"%s\" in to clause\n",
+						    fname, lineno, style );
+						acl_usage();
 					}
 
 					continue;
 				}
 
-				if ( right == NULL || *right == '\0' ) {
-					fprintf( stderr,
-	"%s: line %d: missing \"=\" in (or value after) \"%s\" in to clause\n",
-					    fname, lineno, left );
-					acl_usage();
-				}
-
 				if ( strcasecmp( left, "filter" ) == 0 ) {
 					if ( (a->acl_filter = str2filter(
 					    right )) == NULL ) {
@@ -212,15 +227,21 @@ parse_acl(
 			}
 			
 			if( a->acl_dn_pat != NULL ) {
-				int e = regcomp( &a->acl_dn_re, a->acl_dn_pat,
-				                 REG_EXTENDED | REG_ICASE );
-				if ( e ) {
-					char buf[512];
-					regerror( e, &a->acl_dn_re, buf, sizeof(buf) );
-					fprintf( stderr,
-				"%s: line %d: regular expression \"%s\" bad because of %s\n",
-					         fname, lineno, right, buf );
-					acl_usage();
+				if ( a->acl_dn_style != ACL_STYLE_REGEX )
+				{
+					dn_normalize(a->acl_dn_pat);
+
+				} else {
+					int e = regcomp( &a->acl_dn_re, a->acl_dn_pat,
+					                 REG_EXTENDED | REG_ICASE );
+					if ( e ) {
+						char buf[512];
+						regerror( e, &a->acl_dn_re, buf, sizeof(buf) );
+						fprintf( stderr,
+					"%s: line %d: regular expression \"%s\" bad because of %s\n",
+						         fname, lineno, right, buf );
+						acl_usage();
+					}
 				}
 			}
 
@@ -239,7 +260,7 @@ parse_acl(
 
 			b = (Access *) ch_calloc( 1, sizeof(Access) );
 
-			ACL_INVALIDATE( b->a_mask );
+			ACL_INVALIDATE( b->a_access_mask );
 
 			if ( ++i == argc ) {
 				fprintf( stderr,
@@ -251,7 +272,30 @@ parse_acl(
 			/* get <who> */
 			for ( ; i < argc; i++ ) {
 				char *pat;
+				slap_style_t sty = ACL_STYLE_REGEX;
+
 				split( argv[i], '=', &left, &right );
+				split( left, '.', &left, &style );
+				if ( style == NULL || *style == '\0'
+					|| strcasecmp( style, "regex" ) == 0 )
+				{
+					sty = ACL_STYLE_REGEX;
+				} else if ( strcasecmp( style, "exact" ) == 0 ) {
+					sty = ACL_STYLE_EXACT;
+				} else if ( strcasecmp( style, "base" ) == 0 ) {
+					sty = ACL_STYLE_BASE;
+				} else if ( strcasecmp( style, "one" ) == 0 ) {
+					sty = ACL_STYLE_ONE;
+				} else if ( strcasecmp( style, "subtree" ) == 0 ) {
+					sty = ACL_STYLE_SUBTREE;
+				} else if ( strcasecmp( style, "children" ) == 0 ) {
+					sty = ACL_STYLE_CHILDREN;
+				} else {
+					fprintf( stderr,
+						"%s: line %d: unknown style \"%s\" in by clause\n",
+					    fname, lineno, style );
+					acl_usage();
+				}
 
 				if ( strcasecmp( argv[i], "*" ) == 0 ) {
 					pat = ch_strdup( "*" );
@@ -266,39 +310,50 @@ parse_acl(
 					pat = ch_strdup( "users" );
 
 				} else if ( strcasecmp( left, "dn" ) == 0 ) {
-					if( right == NULL ) {
-						/* no '=' */
-						pat = ch_strdup( "users" );
-
-					} else if (*right == '\0' ) {
-						/* dn="" */
-						pat = ch_strdup( "anonymous" );
-
-					} else if ( strcmp( right, "*" ) == 0 ) {
-						/* dn=* /
-						/* any or users?  any for now */
-						pat = ch_strdup( "users" );
-
-					} else if ( 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 )
-					{
-						pat = ch_strdup( "*" );
+					if ( sty == ACL_STYLE_REGEX ) {
+						b->a_dn_style = ACL_STYLE_REGEX;
+						if( right == NULL ) {
+							/* no '=' */
+							pat = ch_strdup( "users" );
+
+						} else if (*right == '\0' ) {
+							/* dn="" */
+							pat = ch_strdup( "anonymous" );
+
+						} else if ( strcmp( right, "*" ) == 0 ) {
+							/* dn=* */
+							/* any or users?  users for now */
+							pat = ch_strdup( "users" );
+
+						} else if ( 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 )
+						{
+							pat = ch_strdup( "*" );
+
+						} else {
+							pat = acl_regex_normalized_dn( right );
+							regtest(fname, lineno, pat);
+						}
+					} else if ( right == NULL || *right == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+						    fname, lineno, left );
+						acl_usage();
 
 					} else {
-						regtest(fname, lineno, right);
 						pat = ch_strdup( right );
 					}
 
@@ -315,18 +370,27 @@ parse_acl(
 					}
 
 					b->a_dn_pat = pat;
+					b->a_dn_style = sty;
+					if ( sty != ACL_STYLE_REGEX )
+						dn_normalize(pat);
 					continue;
 				}
 
 				if ( strcasecmp( left, "dnattr" ) == 0 ) {
-					if( b->a_dn_pat != NULL ) {
+					if ( right == NULL || right[ 0 ] == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+							fname, lineno, left );
+						acl_usage();
+					}
+
+					if( b->a_dn_at != NULL ) {
 						fprintf( stderr,
 							"%s: line %d: dnattr already specified.\n",
 							fname, lineno );
 						acl_usage();
 					}
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 					rc = slap_str2ad( right, &b->a_dn_at, &text );
 
 					if( rc != LDAP_SUCCESS ) {
@@ -336,26 +400,41 @@ parse_acl(
 						acl_usage();
 					}
 
-#ifdef SLAPD_OID_DN_SYNTAX
-					if( strcmp( b->a_dn_at->ad_type->sat_syntax_oid,
-						SLAPD_OID_DN_SYNTAX ) != 0 )
+
+					if( !is_at_syntax( b->a_dn_at->ad_type,
+						SLAPD_DN_SYNTAX ) &&
+						!is_at_syntax( b->a_dn_at->ad_type,
+						SLAPD_NAMEUID_SYNTAX ))
 					{
 						fprintf( stderr,
-							"%s: line %d: dnattr attribute type not of DN syntax.\n",
-							fname, lineno );
+							"%s: line %d: dnattr \"%s\": "
+							"inappropriate syntax: %s\n",
+							fname, lineno, right,
+							b->a_dn_at->ad_type->sat_syntax_oid );
 						acl_usage();
 					}
-#endif
-#else
-					b->a_dn_at = ch_strdup( right );
-#endif
+
 					continue;
 				}
 
+				if (sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE) {
+					fprintf( stderr,
+						"%s: line %d: inappropriate style \"%s\" in by clause\n",
+					    fname, lineno, style );
+					acl_usage();
+				}
+
 				if ( strncasecmp( left, "group", sizeof("group")-1 ) == 0 ) {
 					char *name = NULL;
 					char *value = NULL;
 
+					if ( right == NULL || right[ 0 ] == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+							fname, lineno, left );
+						acl_usage();
+					}
+
 					if( b->a_group_pat != NULL ) {
 						fprintf( stderr,
 							"%s: line %d: group pattern already specified.\n",
@@ -373,19 +452,61 @@ parse_acl(
 						}
 					}
 
-					regtest(fname, lineno, right);
-					b->a_group_pat = ch_strdup( right );
+					b->a_group_style = sty;
+					if (sty == ACL_STYLE_REGEX) {
+						char *tmp = acl_regex_normalized_dn( right );
+						regtest(fname, lineno, tmp);
+						b->a_group_pat = tmp;
+					} else {
+						b->a_group_pat = ch_strdup( right );
+						dn_normalize(b->a_group_pat);
+					}
 
 					if (value && *value) {
-						b->a_group_oc = ch_strdup(value);
+						b->a_group_oc = oc_find( value );
 						*--value = '/';
+
+						if( b->a_group_oc == NULL ) {
+							fprintf( stderr,
+								"%s: line %d: group objectclass "
+								"\"%s\" unknown\n",
+								fname, lineno, value );
+							acl_usage();
+						}
 					} else {
-						b->a_group_oc = ch_strdup("groupOfNames");
+						b->a_group_oc = oc_find(SLAPD_GROUP_CLASS);
+
+						if( b->a_group_oc == NULL ) {
+							fprintf( stderr,
+								"%s: line %d: group default objectclass "
+								"\"%s\" unknown\n",
+								fname, lineno, SLAPD_GROUP_CLASS );
+							acl_usage();
+						}
+					}
+
+					if( is_object_subclass( b->a_group_oc,
+						slap_schema.si_oc_referral ) )
+					{
+						fprintf( stderr,
+							"%s: line %d: group objectclass \"%s\" "
+							"is subclass of referral\n",
+							fname, lineno, value );
+						acl_usage();
+					}
+
+					if( is_object_subclass( b->a_group_oc,
+						slap_schema.si_oc_alias ) )
+					{
+						fprintf( stderr,
+							"%s: line %d: group objectclass \"%s\" "
+							"is subclass of alias\n",
+							fname, lineno, value );
+						acl_usage();
 					}
 
 					if (name && *name) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-						rc = slap_str2ad( right, &b->a_group_at, &text );
+						rc = slap_str2ad( name, &b->a_group_at, &text );
 
 						if( rc != LDAP_SUCCESS ) {
 							fprintf( stderr,
@@ -393,42 +514,64 @@ parse_acl(
 								fname, lineno, right, text );
 							acl_usage();
 						}
-#else
-						b->a_group_at = ch_strdup(name);
-#endif
 						*--name = '/';
-
 					} else {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-						b->a_group_at = member;
-#else
-						b->a_group_at = ch_strdup("member");
-#endif
+						rc = slap_str2ad( SLAPD_GROUP_ATTR, &b->a_group_at, &text );
+
+						if( rc != LDAP_SUCCESS ) {
+							fprintf( stderr,
+								"%s: line %d: group \"%s\": %s\n",
+								fname, lineno, SLAPD_GROUP_ATTR, text );
+							acl_usage();
+						}
 					}
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-					if( b->a_group_at == NULL ) {
+					if( !is_at_syntax( b->a_group_at->ad_type,
+						SLAPD_DN_SYNTAX ) &&
+					    !is_at_syntax( b->a_group_at->ad_type,
+						SLAPD_NAMEUID_SYNTAX ) )
+					{
 						fprintf( stderr,
-							"%s: line %d: group attribute type undefined.\n",
-							fname, lineno );
+							"%s: line %d: group \"%s\": inappropriate syntax: %s\n",
+							fname, lineno, right,
+							b->a_group_at->ad_type->sat_syntax_oid );
 						acl_usage();
 					}
 
-#ifdef SLAPD_OID_DN_SYNTAX
-					if( strcmp( b->a_group_at->ad_type->sat_syntax_oid,
-						SLAPD_OID_DN_SYNTAX ) != 0 )
+
 					{
-						fprintf( stderr,
-							"%s: line %d: group attribute type not of DN syntax.\n",
-							fname, lineno );
-						acl_usage();
+						int rc;
+						struct berval val;
+						struct berval *vals[2];
+
+						val.bv_val = b->a_group_oc->soc_oid;
+						val.bv_len = strlen(val.bv_val);
+						vals[0] = &val;
+						vals[1] = NULL;
+
+
+						rc = oc_check_allowed( b->a_group_at->ad_type, vals );
+
+						if( rc != 0 ) {
+							fprintf( stderr,
+								"%s: line %d: group: \"%s\" not allowed by \"%s\"\n",
+								fname, lineno,
+								b->a_group_at->ad_cname.bv_val,
+								b->a_group_oc->soc_oid );
+							acl_usage();
+						}
 					}
-#endif /* SLAPD_OID_DN_SYNTAX */
-#endif /* SLAPD_SCHEMA_NOT_COMPAT */
 					continue;
 				}
 
 				if ( strcasecmp( left, "peername" ) == 0 ) {
+					if ( right == NULL || right[ 0 ] == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+							fname, lineno, left );
+						acl_usage();
+					}
+
 					if( b->a_peername_pat != NULL ) {
 						fprintf( stderr,
 							"%s: line %d: peername pattern already specified.\n",
@@ -436,12 +579,25 @@ parse_acl(
 						acl_usage();
 					}
 
-					regtest(fname, lineno, right);
-					b->a_peername_pat = ch_strdup( right );
+					b->a_peername_style = sty;
+					if (sty == ACL_STYLE_REGEX) {
+						char *tmp = acl_regex_normalized_dn( right );
+						regtest(fname, lineno, tmp);
+						b->a_peername_pat = tmp;
+					} else {
+						b->a_peername_pat = ch_strdup( right );
+					}
 					continue;
 				}
 
 				if ( strcasecmp( left, "sockname" ) == 0 ) {
+					if ( right == NULL || right[ 0 ] == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+							fname, lineno, left );
+						acl_usage();
+					}
+
 					if( b->a_sockname_pat != NULL ) {
 						fprintf( stderr,
 							"%s: line %d: sockname pattern already specified.\n",
@@ -449,12 +605,25 @@ parse_acl(
 						acl_usage();
 					}
 
-					regtest(fname, lineno, right);
-					b->a_sockname_pat = ch_strdup( right );
+					b->a_sockname_style = sty;
+					if (sty == ACL_STYLE_REGEX) {
+						char *tmp = acl_regex_normalized_dn( right );
+						regtest(fname, lineno, tmp);
+						b->a_sockname_pat = tmp;
+					} else {
+						b->a_sockname_pat = ch_strdup( right );
+					}
 					continue;
 				}
 
 				if ( strcasecmp( left, "domain" ) == 0 ) {
+					if ( right == NULL || right[ 0 ] == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+							fname, lineno, left );
+						acl_usage();
+					}
+
 					if( b->a_domain_pat != NULL ) {
 						fprintf( stderr,
 							"%s: line %d: domain pattern already specified.\n",
@@ -462,12 +631,25 @@ parse_acl(
 						acl_usage();
 					}
 
-					regtest(fname, lineno, right);
-					b->a_domain_pat = ch_strdup( right );
+					b->a_domain_style = sty;
+					if (sty == ACL_STYLE_REGEX) {
+						char *tmp = acl_regex_normalized_dn( right );
+						regtest(fname, lineno, tmp);
+						b->a_domain_pat = tmp;
+					} else {
+						b->a_domain_pat = ch_strdup( right );
+					}
 					continue;
 				}
 
 				if ( strcasecmp( left, "sockurl" ) == 0 ) {
+					if ( right == NULL || right[ 0 ] == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+							fname, lineno, left );
+						acl_usage();
+					}
+
 					if( b->a_sockurl_pat != NULL ) {
 						fprintf( stderr,
 							"%s: line %d: sockurl pattern already specified.\n",
@@ -475,8 +657,35 @@ parse_acl(
 						acl_usage();
 					}
 
-					regtest(fname, lineno, right);
-					b->a_sockurl_pat = ch_strdup( right );
+					b->a_sockurl_style = sty;
+					if (sty == ACL_STYLE_REGEX) {
+						char *tmp = acl_regex_normalized_dn( right );
+						regtest(fname, lineno, tmp);
+						b->a_sockurl_pat = tmp;
+					} else {
+						b->a_sockurl_pat = ch_strdup( right );
+					}
+					continue;
+				}
+
+				if ( strcasecmp( left, "set" ) == 0 ) {
+					if( b->a_set_pat != NULL ) {
+						fprintf( stderr,
+							"%s: line %d: set attribute already specified.\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					if ( right == NULL || *right == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: no set is defined\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					b->a_set_style = sty;
+					b->a_set_pat = ch_strdup(right);
+
 					continue;
 				}
 
@@ -489,7 +698,6 @@ parse_acl(
 						acl_usage();
 					}
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 					if ( right != NULL && *right != '\0' ) {
 						rc = slap_str2ad( right, &b->a_aci_at, &text );
 
@@ -499,35 +707,135 @@ parse_acl(
 								fname, lineno, right, text );
 							acl_usage();
 						}
+
 					} else {
-						b->a_aci_at = aci;
+						rc = slap_str2ad( SLAPD_ACI_ATTR, &b->a_aci_at, &text );
+
+						if( rc != LDAP_SUCCESS ) {
+							fprintf( stderr,
+								"%s: line %d: aci \"%s\": %s\n",
+								fname, lineno, SLAPD_ACI_ATTR, text );
+							acl_usage();
+						}
 					}
 
-					if( b->a_aci_at == NULL ) {
+					if( !is_at_syntax( b->a_aci_at->ad_type,
+						SLAPD_ACI_SYNTAX) )
+					{
 						fprintf( stderr,
-							"%s: line %d: aci attribute type undefined.\n",
+							"%s: line %d: aci \"%s\": inappropriate syntax: %s\n",
+							fname, lineno, right,
+							b->a_aci_at->ad_type->sat_syntax_oid );
+						acl_usage();
+					}
+
+					continue;
+				}
+#endif /* SLAPD_ACI_ENABLED */
+
+				if ( strcasecmp( left, "ssf" ) == 0 ) {
+					if( b->a_authz.sai_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: ssf attribute already specified.\n",
 							fname, lineno );
 						acl_usage();
 					}
 
-					if( strcmp( b->a_aci_at->ad_type->sat_syntax_oid,
-						SLAPD_OID_ACI_SYNTAX ) != 0 )
-					{
+					if ( right == NULL || *right == '\0' ) {
 						fprintf( stderr,
-							"%s: line %d: aci attribute type not of ACI syntax.\n",
+							"%s: line %d: no ssf is defined\n",
 							fname, lineno );
 						acl_usage();
 					}
-#else
-					if ( right != NULL && *right != '\0' ) {
-						b->a_aci_at = ch_strdup( right );
-					} else {
-						b->a_aci_at = ch_strdup( SLAPD_ACI_DEFAULT_ATTR );
+
+					b->a_authz.sai_ssf = atoi( right );
+
+					if( !b->a_authz.sai_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: invalid ssf value (%s)\n",
+							fname, lineno, right );
+						acl_usage();
+					}
+					continue;
+				}
+
+				if ( strcasecmp( left, "transport_ssf" ) == 0 ) {
+					if( b->a_authz.sai_transport_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: transport_ssf attribute already specified.\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					if ( right == NULL || *right == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: no transport_ssf is defined\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					b->a_authz.sai_transport_ssf = atoi( right );
+
+					if( !b->a_authz.sai_transport_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: invalid transport_ssf value (%s)\n",
+							fname, lineno, right );
+						acl_usage();
+					}
+					continue;
+				}
+
+				if ( strcasecmp( left, "tls_ssf" ) == 0 ) {
+					if( b->a_authz.sai_tls_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: tls_ssf attribute already specified.\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					if ( right == NULL || *right == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: no tls_ssf is defined\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					b->a_authz.sai_tls_ssf = atoi( right );
+
+					if( !b->a_authz.sai_tls_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: invalid tls_ssf value (%s)\n",
+							fname, lineno, right );
+						acl_usage();
+					}
+					continue;
+				}
+
+				if ( strcasecmp( left, "sasl_ssf" ) == 0 ) {
+					if( b->a_authz.sai_sasl_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: sasl_ssf attribute already specified.\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					if ( right == NULL || *right == '\0' ) {
+						fprintf( stderr,
+							"%s: line %d: no sasl_ssf is defined\n",
+							fname, lineno );
+						acl_usage();
+					}
+
+					b->a_authz.sai_sasl_ssf = atoi( right );
+
+					if( !b->a_authz.sai_sasl_ssf ) {
+						fprintf( stderr,
+							"%s: line %d: invalid sasl_ssf value (%s)\n",
+							fname, lineno, right );
+						acl_usage();
 					}
-#endif
 					continue;
 				}
-#endif /* SLAPD_ACI_ENABLED */
 
 				if( right != NULL ) {
 					/* unsplit */
@@ -539,7 +847,7 @@ parse_acl(
 			if( i == argc || ( strcasecmp( left, "stop" ) == 0 )) { 
 				/* out of arguments or plain stop */
 
-				ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+				ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
 				b->a_type = ACL_STOP;
 
 				access_append( &a->acl_access, b );
@@ -549,7 +857,7 @@ parse_acl(
 			if( strcasecmp( left, "continue" ) == 0 ) {
 				/* plain continue */
 
-				ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+				ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
 				b->a_type = ACL_CONTINUE;
 
 				access_append( &a->acl_access, b );
@@ -559,7 +867,7 @@ parse_acl(
 			if( strcasecmp( left, "break" ) == 0 ) {
 				/* plain continue */
 
-				ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+				ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
 				b->a_type = ACL_BREAK;
 
 				access_append( &a->acl_access, b );
@@ -569,7 +877,7 @@ parse_acl(
 			if ( strcasecmp( left, "by" ) == 0 ) {
 				/* we've gone too far */
 				--i;
-				ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+				ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
 				b->a_type = ACL_STOP;
 
 				access_append( &a->acl_access, b );
@@ -579,13 +887,13 @@ parse_acl(
 			/* get <access> */
 			if( strncasecmp( left, "self", 4 ) == 0 ) {
 				b->a_dn_self = 1;
-				ACL_PRIV_ASSIGN( b->a_mask, str2accessmask( &left[4] ) );
+				ACL_PRIV_ASSIGN( b->a_access_mask, str2accessmask( &left[4] ) );
 
 			} else {
-				ACL_PRIV_ASSIGN( b->a_mask, str2accessmask( left ) );
+				ACL_PRIV_ASSIGN( b->a_access_mask, str2accessmask( left ) );
 			}
 
-			if( ACL_IS_INVALID( b->a_mask ) ) {
+			if( ACL_IS_INVALID( b->a_access_mask ) ) {
 				fprintf( stderr,
 					"%s: line %d: expecting <access> got \"%s\"\n",
 					fname, lineno, left );
@@ -650,7 +958,7 @@ parse_acl(
 }
 
 char *
-accessmask2str( slap_access_mask_t mask, char *buf )
+accessmask2str( slap_mask_t mask, char *buf )
 {
 	int none=1;
 
@@ -737,12 +1045,12 @@ accessmask2str( slap_access_mask_t mask, char *buf )
 	return buf;
 }
 
-slap_access_mask_t
+slap_mask_t
 str2accessmask( const char *str )
 {
-	slap_access_mask_t	mask;
+	slap_mask_t	mask;
 
-	if( !isalpha(str[0]) ) {
+	if( !ASCII_ALPHA(str[0]) ) {
 		int i;
 
 		if ( str[0] == '=' ) {
@@ -814,18 +1122,22 @@ acl_usage( void )
 {
 	fprintf( stderr, "\n"
 		"<access clause> ::= access to <what> "
-				"[ by <who> <access> <control> ]+ \n"
-		"<what> ::= * | [dn=<regex>] [filter=<ldapfilter>] [attrs=<attrlist>]\n"
+				"[ by <who> <access> [ <control> ] ]+ \n"
+		"<what> ::= * | [dn[.<dnstyle>]=<regex>] [filter=<ldapfilter>] [attrs=<attrlist>]\n"
 		"<attrlist> ::= <attr> | <attr> , <attrlist>\n"
 		"<attr> ::= <attrname> | entry | children\n"
-		"<who> ::= [ * | anonymous | users | self | dn=<regex> ]\n"
+		"<who> ::= [ * | anonymous | users | self | dn[.<dnstyle>]=<regex> ]\n"
 			"\t[dnattr=<attrname>]\n"
-			"\t[group[/<objectclass>[/<attrname>]]=<regex>]\n"
-			"\t[peername=<regex>] [sockname=<regex>]\n"
-			"\t[domain=<regex>] [sockurl=<regex>]\n"
+			"\t[group[/<objectclass>[/<attrname>]][.<style>]=<regex>]\n"
+			"\t[peername[.<style>]=<regex>] [sockname[.<style>]=<regex>]\n"
+			"\t[domain[.<style>]=<regex>] [sockurl[.<style>]=<regex>]\n"
 #ifdef SLAPD_ACI_ENABLED
 			"\t[aci=<attrname>]\n"
 #endif
+			"\t[ssf=<n>] [transport_ssf=<n>] [tls_ssf=<n>] [sasl_ssf=<n>]\n"
+		"<dnstyle> ::= regex | base | exact (alias of base) | one | sub | children\n"
+		"<style> ::= regex | base | exact (alias of base)\n"
+		"<groupflags> ::= R\n"
 		"<access> ::= [self]{<level>|<priv>}\n"
 		"<level> ::= none | auth | compare | search | read | write\n"
 		"<priv> ::= {=|+|-}{w|r|s|c|x}+\n"
@@ -834,6 +1146,45 @@ acl_usage( void )
 	exit( EXIT_FAILURE );
 }
 
+/*
+ * At present it simply eats the (optional) space after 
+ * a RDN separator (,)
+ * Eventually will evolve in a more complete normalization
+ */
+static char *
+acl_regex_normalized_dn(
+	const char *pattern
+)
+{
+	char *str, *p;
+
+	str = ch_strdup( pattern );
+
+	if ( str == NULL ) {
+		return( NULL );
+	}
+
+	for ( p = str; p[ 0 ]; p++ ) {
+		/* escape */
+		if ( p[ 0 ] == '\\' ) {
+			p++;
+		}
+
+		if ( p[ 0 ] == ',' ) {
+			if ( p[ 1 ] == ' ' ) {
+				char *q;
+			
+				for ( q = &p[ 2 ]; q[ 0 ] == ' '; q++ ) {
+					/* DO NOTHING */ ;
+				}
+				AC_MEMCPY( &p[ 1 ], &q[ 0 ], strlen( q ) + 1 );
+			}
+		}
+	}
+
+	return( str );
+}
+
 static void
 split(
     char	*line,
@@ -918,6 +1269,15 @@ str2access( const char *str )
 
 #ifdef LDAP_DEBUG
 
+static char *style_strings[5] = {
+			"regex",
+			"base",
+			"one",
+			"subtree",
+			"children"
+		};
+
+
 static void
 print_access( Access *b )
 {
@@ -934,22 +1294,23 @@ print_access( Access *b )
 			fprintf( stderr, " %s", b->a_dn_pat );
 
 		} else {
-			fprintf( stderr, " dn=%s", b->a_dn_pat );
+			fprintf( stderr, " dn.%s=%s", style_strings[b->a_dn_style], b->a_dn_pat );
 		}
 	}
 
 	if ( b->a_dn_at != NULL ) {
-		fprintf( stderr, " dnattr=%s", b->a_dn_at );
+		fprintf( stderr, " dnattr=%s", b->a_dn_at->ad_cname.bv_val );
 	}
 
 	if ( b->a_group_pat != NULL ) {
-		fprintf( stderr, " group: %s", b->a_group_pat );
+		fprintf( stderr, " group=%s", b->a_group_pat );
 
 		if ( b->a_group_oc ) {
-			fprintf( stderr, " objectClass: %s", b->a_group_oc );
+			fprintf( stderr, " objectClass: %s",
+				b->a_group_oc->soc_oclass.oc_oid );
 
 			if ( b->a_group_at ) {
-				fprintf( stderr, " attributeType: %s", b->a_group_at );
+				fprintf( stderr, " attributeType: %s", b->a_group_at->ad_cname.bv_val );
 			}
 		}
     }
@@ -972,13 +1333,31 @@ print_access( Access *b )
 
 #ifdef SLAPD_ACI_ENABLED
 	if ( b->a_aci_at != NULL ) {
-		fprintf( stderr, " aci=%s", b->a_aci_at );
+		fprintf( stderr, " aci=%s", b->a_aci_at->ad_cname.bv_val );
 	}
 #endif
 
+	/* Security Strength Factors */
+	if ( b->a_authz.sai_ssf ) {
+		fprintf( stderr, " ssf=%u",
+			b->a_authz.sai_ssf );
+	}
+	if ( b->a_authz.sai_transport_ssf ) {
+		fprintf( stderr, " transport_ssf=%u",
+			b->a_authz.sai_transport_ssf );
+	}
+	if ( b->a_authz.sai_tls_ssf ) {
+		fprintf( stderr, " tls_ssf=%u",
+			b->a_authz.sai_tls_ssf );
+	}
+	if ( b->a_authz.sai_sasl_ssf ) {
+		fprintf( stderr, " sasl_ssf=%u",
+			b->a_authz.sai_sasl_ssf );
+	}
+
 	fprintf( stderr, " %s%s",
 		b->a_dn_self ? "self" : "",
-		accessmask2str( b->a_mask, maskbuf ) );
+		accessmask2str( b->a_access_mask, maskbuf ) );
 
 	if( b->a_type == ACL_BREAK ) {
 		fprintf( stderr, " break" );
@@ -1005,8 +1384,8 @@ print_acl( Backend *be, AccessControl *a )
 
 	if ( a->acl_dn_pat != NULL ) {
 		to++;
-		fprintf( stderr, " dn=%s\n",
-			a->acl_dn_pat );
+		fprintf( stderr, " dn.%s=%s\n",
+			style_strings[a->acl_dn_style], a->acl_dn_pat );
 	}
 
 	if ( a->acl_filter != NULL ) {