X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Faclparse.c;h=a4b8ed850f1456d1fa1edd3ebc8cb2e1dce5eb6f;hb=21be582df7e13ae2c8d44e1f7f02478eb9ec0762;hp=339bc6a5824272a0186fa10ee5eab4a583d81b17;hpb=ceb9c15bdd1d0e1cbe8d17f6101897863856e8c2;p=openldap

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 339bc6a582..a4b8ed850f 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ char *style_strings[] = {
 
 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 int		acl_usage(void);
 
 static void		acl_regex_normalized_dn(const char *src, struct berval *pat);
 
@@ -87,7 +87,7 @@ slap_dynacl_config(
 			Debug( LDAP_DEBUG_ANY,
 				"%s: line %d: dynacl \"%s\" already specified.\n",
 				fname, lineno, name );
-			acl_usage();
+			return acl_usage();
 		}
 	}
 
@@ -154,7 +154,8 @@ regtest(const char *fname, int lineno, char *pat) {
 		Debug( LDAP_DEBUG_ANY,
 			"%s: line %d: regular expression \"%s\" too large\n",
 			fname, lineno, pat );
-		acl_usage();
+		(void)acl_usage();
+		exit( EXIT_FAILURE );
 	}
 
 	if ((e = regcomp(&re, buf, REG_EXTENDED|REG_ICASE))) {
@@ -169,6 +170,7 @@ regtest(const char *fname, int lineno, char *pat) {
 			"%s: line %d: %s\n",
 			fname, lineno, buf );
 		acl_usage();
+		exit( EXIT_FAILURE );
 	}
 	regfree(&re);
 }
@@ -267,7 +269,7 @@ regex_done:;
 					sep = 1;
 				}
 
-				rdnlen = (ber_len_t)dn_rdnlen( NULL, &dn );
+				rdnlen = dn_rdnlen( NULL, &dn );
 				if ( rdnlen != dn.bv_len - patlen - sep )
 					return ACL_SCOPE_ERR;
 			}
@@ -313,17 +315,17 @@ regex_done:;
 	return ACL_SCOPE_UNKNOWN;
 }
 
-void
+int
 parse_acl(
-    Backend	*be,
-    const char	*fname,
-    int		lineno,
-    int		argc,
-    char	**argv,
+	Backend	*be,
+	const char	*fname,
+	int		lineno,
+	int		argc,
+	char		**argv,
 	int		pos )
 {
 	int		i;
-	char		*left, *right, *style, *next;
+	char		*left, *right, *style;
 	struct berval	bv;
 	AccessControl	*a;
 	Access	*b;
@@ -338,7 +340,7 @@ parse_acl(
 				Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 					"only one to clause allowed in access line\n",
 				    fname, lineno, 0 );
-				acl_usage();
+				return acl_usage();
 			}
 			a = (AccessControl *) ch_calloc( 1, sizeof(AccessControl) );
 			for ( ++i; i < argc; i++ ) {
@@ -355,7 +357,7 @@ parse_acl(
 							"%s: line %d: dn pattern"
 							" already specified in to clause.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					ber_str2bv( "*", STRLENOF( "*" ), 1, &a->acl_dn_pat );
@@ -369,7 +371,7 @@ parse_acl(
 					Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 						"missing \"=\" in \"%s\" in to clause\n",
 					    fname, lineno, left );
-					acl_usage();
+					return acl_usage();
 				}
 
 				if ( strcasecmp( left, "dn" ) == 0 ) {
@@ -380,7 +382,7 @@ parse_acl(
 							"%s: line %d: dn pattern"
 							" already specified in to clause.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( style == NULL || *style == '\0' ||
@@ -438,7 +440,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"unknown dn style \"%s\" in to clause\n",
 						    fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					continue;
@@ -449,39 +451,48 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY,
 				"%s: line %d: bad filter \"%s\" in to clause\n",
 						    fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 
 				} else if ( strcasecmp( left, "attr" ) == 0		/* TOLERATED */
 						|| strcasecmp( left, "attrs" ) == 0 )	/* DOCUMENTED */
 				{
+					if ( strcasecmp( left, "attr" ) == 0 ) {
+						Debug( LDAP_DEBUG_ANY,
+							"%s: line %d: \"attr\" "
+							"is deprecated (and undocumented); "
+							"use \"attrs\" instead.\n",
+							fname, lineno, 0 );
+					}
+
 					a->acl_attrs = str2anlist( a->acl_attrs,
 						right, "," );
 					if ( a->acl_attrs == NULL ) {
 						Debug( LDAP_DEBUG_ANY,
 				"%s: line %d: unknown attr \"%s\" in to clause\n",
 						    fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 
 				} else if ( strncasecmp( left, "val", 3 ) == 0 ) {
-					char	*mr;
+					struct berval	bv;
+					char		*mr;
 					
 					if ( !BER_BVISEMPTY( &a->acl_attrval ) ) {
 						Debug( LDAP_DEBUG_ANY,
 				"%s: line %d: attr val already specified in to clause.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 					if ( a->acl_attrs == NULL || !BER_BVISEMPTY( &a->acl_attrs[1].an_name ) )
 					{
 						Debug( LDAP_DEBUG_ANY,
 				"%s: line %d: attr val requires a single attribute.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
-					ber_str2bv( right, 0, 1, &a->acl_attrval );
+					ber_str2bv( right, 0, 0, &bv );
 					a->acl_attrval_style = ACL_STYLE_BASE;
 
 					mr = strchr( left, '/' );
@@ -494,7 +505,7 @@ parse_acl(
 							Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 								"invalid matching rule \"%s\".\n",
 								fname, lineno, mr );
-							acl_usage();
+							return acl_usage();
 						}
 
 						if( !mr_usable_with_at( a->acl_attrval_mr, a->acl_attrs[ 0 ].an_desc->ad_type ) )
@@ -509,13 +520,13 @@ parse_acl(
 
 							Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
 								fname, lineno, buf );
-							acl_usage();
+							return acl_usage();
 						}
 					}
 					
 					if ( style != NULL ) {
 						if ( strcasecmp( style, "regex" ) == 0 ) {
-							int e = regcomp( &a->acl_attrval_re, a->acl_attrval.bv_val,
+							int e = regcomp( &a->acl_attrval_re, bv.bv_val,
 								REG_EXTENDED | REG_ICASE | REG_NOSUB );
 							if ( e ) {
 								char	err[SLAP_TEXT_BUFLEN],
@@ -529,7 +540,7 @@ parse_acl(
 
 								Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
 									fname, lineno, buf );
-								acl_usage();
+								return acl_usage();
 							}
 							a->acl_attrval_style = ACL_STYLE_REGEX;
 
@@ -543,8 +554,6 @@ parse_acl(
 							} else if ( a->acl_attrs[0].an_desc->ad_type->
 								sat_syntax == slap_schema.si_syn_distinguishedName )
 							{
-								struct berval	bv;
-
 								if ( !strcasecmp( style, "baseObject" ) ||
 									!strcasecmp( style, "base" ) )
 								{
@@ -566,8 +575,10 @@ parse_acl(
 
 									snprintf( buf, sizeof( buf ),
 										"unknown val.<style> \"%s\" "
-										"for attributeType \"%s\" with DN syntax; "
-										"using \"base\""
+										"for attributeType \"%s\" with DN syntax"
+#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
+										"; using \"base\""
+#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
 										SLAPD_CONF_UNKNOWN_IGNORED ".",
 										style,
 										a->acl_attrs[0].an_desc->ad_cname.bv_val );
@@ -576,12 +587,11 @@ parse_acl(
 										"%s: line %d: %s\n",
 										fname, lineno, buf );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-									acl_usage();
+									return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 									a->acl_attrval_style = ACL_STYLE_BASE;
 								}
 
-								bv = a->acl_attrval;
 								rc = dnNormalize( 0, NULL, NULL, &bv, &a->acl_attrval, NULL );
 								if ( rc != LDAP_SUCCESS ) {
 									char	buf[ SLAP_TEXT_BUFLEN ];
@@ -595,9 +605,8 @@ parse_acl(
 									Debug( LDAP_DEBUG_ANY, 
 										"%s: line %d: %s\n",
 										fname, lineno, buf );
-									acl_usage();
+									return acl_usage();
 								}
-								ber_memfree( bv.bv_val );
 
 							} else {
 								char	buf[ SLAP_TEXT_BUFLEN ];
@@ -606,14 +615,17 @@ parse_acl(
 
 								snprintf( buf, sizeof( buf ),
 									"unknown val.<style> \"%s\" "
-									"for attributeType \"%s\"; using \"exact\""
+									"for attributeType \"%s\""
+#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
+									"; using \"exact\""
+#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
 									SLAPD_CONF_UNKNOWN_IGNORED ".",
 									style, a->acl_attrs[0].an_desc->ad_cname.bv_val );
 								Debug( LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL, 
 									"%s: line %d: %s\n",
 									fname, lineno, buf );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-								acl_usage();
+								return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 								a->acl_attrval_style = ACL_STYLE_BASE;
 							}
@@ -621,16 +633,41 @@ parse_acl(
 					}
 
 					/* Check for appropriate matching rule */
-					if ( a->acl_attrval_style != ACL_STYLE_REGEX ) {
+					if ( a->acl_attrval_style == ACL_STYLE_REGEX ) {
+						ber_dupbv( &a->acl_attrval, &bv );
+
+					} else if ( BER_BVISNULL( &a->acl_attrval ) ) {
+						int		rc;
+						const char	*text;
+
 						if ( a->acl_attrval_mr == NULL ) {
 							a->acl_attrval_mr = a->acl_attrs[ 0 ].an_desc->ad_type->sat_equality;
 						}
 
 						if ( a->acl_attrval_mr == NULL ) {
 							Debug( LDAP_DEBUG_ANY, "%s: line %d: "
-								"attr \"%s\" must have an EQUALITY matching rule.\n",
+								"attr \"%s\" does not have an EQUALITY matching rule.\n",
 								fname, lineno, a->acl_attrs[ 0 ].an_name.bv_val );
-							acl_usage();
+							return acl_usage();
+						}
+
+						rc = asserted_value_validate_normalize(
+							a->acl_attrs[ 0 ].an_desc,
+							a->acl_attrval_mr,
+							SLAP_MR_EQUALITY|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+							&bv,
+							&a->acl_attrval,
+							&text,
+							NULL );
+						if ( rc != LDAP_SUCCESS ) {
+							char	buf[ SLAP_TEXT_BUFLEN ];
+
+							snprintf( buf, sizeof( buf ), "%s: line %d: "
+								" attr \"%s\" normalization failed (%d: %s)",
+								a->acl_attrs[ 0 ].an_name.bv_val, rc, text );
+							Debug( LDAP_DEBUG_ANY, "%s: line %d: %s.\n",
+								fname, lineno, buf );
+							return acl_usage();
 						}
 					}
 
@@ -638,7 +675,7 @@ parse_acl(
 					Debug( LDAP_DEBUG_ANY,
 						"%s: line %d: expecting <what> got \"%s\"\n",
 					    fname, lineno, left );
-					acl_usage();
+					return acl_usage();
 				}
 			}
 
@@ -660,7 +697,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: bad DN \"%s\" in to DN clause\n",
 							fname, lineno, a->acl_dn_pat.bv_val );
-						acl_usage();
+						return acl_usage();
 					}
 					free( a->acl_dn_pat.bv_val );
 					a->acl_dn_pat = bv;
@@ -678,7 +715,7 @@ parse_acl(
 							right, err );
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
 							fname, lineno, buf );
-						acl_usage();
+						return acl_usage();
 					}
 				}
 			}
@@ -689,7 +726,7 @@ parse_acl(
 				Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 					"to clause required before by clause in access line\n",
 					fname, lineno, 0 );
-				acl_usage();
+				return acl_usage();
 			}
 
 			/*
@@ -704,7 +741,7 @@ parse_acl(
 				Debug( LDAP_DEBUG_ANY,
 					"%s: line %d: premature EOL: expecting <who>\n",
 					fname, lineno, 0 );
-				acl_usage();
+				return acl_usage();
 			}
 
 			/* get <who> */
@@ -731,13 +768,13 @@ parse_acl(
 									"%s: line %d: premature eol: "
 									"expecting closing '}' in \"level{n}\"\n",
 									fname, lineno, 0 );
-								acl_usage();
+								return acl_usage();
 							} else if ( p == style_level ) {
 								Debug( LDAP_DEBUG_ANY,
 									"%s: line %d: empty level "
 									"in \"level{n}\"\n",
 									fname, lineno, 0 );
-								acl_usage();
+								return acl_usage();
 							}
 							p[0] = '\0';
 						}
@@ -766,15 +803,12 @@ parse_acl(
 
 				} else if ( strcasecmp( style, "level" ) == 0 )
 				{
-					char	*next;
-
-					level = strtol( style_level, &next, 10 );
-					if ( next[0] != '\0' ) {
+					if ( lutil_atoi( &level, style_level ) != 0 ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: unable to parse level "
 							"in \"level{n}\"\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					sty = ACL_STYLE_LEVEL;
@@ -797,7 +831,7 @@ parse_acl(
 						SLAPD_CONF_UNKNOWN_IGNORED ".\n",
 						fname, lineno, 0 );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-					acl_usage();
+					return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 #endif /* LDAP_PF_LOCAL */
 
@@ -805,7 +839,7 @@ parse_acl(
 					Debug( LDAP_DEBUG_ANY,
 						"%s: line %d: unknown style \"%s\" in by clause\n",
 						fname, lineno, style );
-					acl_usage();
+					return acl_usage();
 				}
 
 				if ( style_modifier &&
@@ -819,7 +853,7 @@ parse_acl(
 							SLAPD_CONF_UNKNOWN_IGNORED ".\n",
 							fname, lineno, 0 );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-						acl_usage();
+						return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 						break;
 
@@ -844,7 +878,7 @@ parse_acl(
 						SLAPD_CONF_UNKNOWN_IGNORED ".\n",
 						fname, lineno, 0 );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-						acl_usage();
+						return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 				}
 
@@ -856,7 +890,7 @@ parse_acl(
 
 				if ( strcasecmp( left, "*" ) == 0 ) {
 					if ( is_realdn ) {
-						acl_usage();
+						return acl_usage();
 					}
 
 					ber_str2bv( "*", STRLENOF( "*" ), 1, &bv );
@@ -934,7 +968,7 @@ parse_acl(
 							"missing \"=\" in (or value after) \"%s\" "
 							"in by clause\n",
 							fname, lineno, left );
-						acl_usage();
+						return acl_usage();
 
 					} else {
 						ber_str2bv( right, 0, 1, &bv );
@@ -949,7 +983,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: dn pattern already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( sty != ACL_STYLE_REGEX &&
@@ -964,9 +998,19 @@ parse_acl(
 							Debug( LDAP_DEBUG_ANY,
 								"%s: line %d: bad DN \"%s\" in by DN clause\n",
 								fname, lineno, bv.bv_val );
-							acl_usage();
+							return acl_usage();
 						}
 						free( bv.bv_val );
+						if ( sty == ACL_STYLE_BASE
+							&& be != NULL
+							&& !BER_BVISNULL( &be->be_rootndn )
+							&& dn_match( &bdn->a_pat, &be->be_rootndn ) )
+						{
+							Debug( LDAP_DEBUG_ANY,
+								"%s: line %d: rootdn is always granted "
+								"unlimited privileges.\n",
+								fname, lineno, 0 );
+						}
 
 					} else {
 						bdn->a_pat = bv;
@@ -997,7 +1041,7 @@ parse_acl(
 								SLAPD_CONF_UNKNOWN_IGNORED ".\n",
 								fname, lineno, 0 );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-							acl_usage();
+							return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 						} 
 					}
@@ -1010,7 +1054,7 @@ parse_acl(
 								"%s: line %d: bad negative level \"%d\" "
 								"in by DN clause\n",
 								fname, lineno, level );
-							acl_usage();
+							return acl_usage();
 						} else if ( level == 1 ) {
 							Debug( LDAP_DEBUG_ANY,
 								"%s: line %d: \"onelevel\" should be used "
@@ -1034,14 +1078,14 @@ parse_acl(
 							"missing \"=\" in (or value after) \"%s\" "
 							"in by clause\n",
 							fname, lineno, left );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if( bdn->a_at != NULL ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: dnattr already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					rc = slap_str2ad( right, &bdn->a_at, &text );
@@ -1055,7 +1099,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: %s\n",
 							fname, lineno, buf );
-						acl_usage();
+						return acl_usage();
 					}
 
 
@@ -1074,7 +1118,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: %s\n",
 							fname, lineno, buf );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if( bdn->a_at->ad_type->sat_equality == NULL ) {
@@ -1082,7 +1126,7 @@ parse_acl(
 							"%s: line %d: dnattr \"%s\": "
 							"inappropriate matching (no EQUALITY)\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 
 					continue;
@@ -1115,7 +1159,7 @@ parse_acl(
 							"%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 							fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || right[0] == '\0' ) {
@@ -1124,14 +1168,14 @@ parse_acl(
 							"missing \"=\" in (or value after) \"%s\" "
 							"in by clause.\n",
 							fname, lineno, left );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !BER_BVISEMPTY( &b->a_group_pat ) ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: group pattern already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					/* format of string is
@@ -1159,7 +1203,7 @@ parse_acl(
 							Debug( LDAP_DEBUG_ANY,
 								"%s: line %d: bad DN \"%s\".\n",
 								fname, lineno, right );
-							acl_usage();
+							return acl_usage();
 						}
 					}
 
@@ -1172,7 +1216,7 @@ parse_acl(
 								"%s: line %d: group objectclass "
 								"\"%s\" unknown.\n",
 								fname, lineno, value );
-							acl_usage();
+							return acl_usage();
 						}
 
 					} else {
@@ -1183,7 +1227,7 @@ parse_acl(
 								"%s: line %d: group default objectclass "
 								"\"%s\" unknown.\n",
 								fname, lineno, SLAPD_GROUP_CLASS );
-							acl_usage();
+							return acl_usage();
 						}
 					}
 
@@ -1194,7 +1238,7 @@ parse_acl(
 							"%s: line %d: group objectclass \"%s\" "
 							"is subclass of referral.\n",
 							fname, lineno, value );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( is_object_subclass( slap_schema.si_oc_alias,
@@ -1204,7 +1248,7 @@ parse_acl(
 							"%s: line %d: group objectclass \"%s\" "
 							"is subclass of alias.\n",
 							fname, lineno, value );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( name && *name ) {
@@ -1219,7 +1263,7 @@ parse_acl(
 							Debug( LDAP_DEBUG_ANY,
 								"%s: line %d: %s\n",
 								fname, lineno, buf );
-							acl_usage();
+							return acl_usage();
 						}
 						*--name = '/';
 
@@ -1235,7 +1279,7 @@ parse_acl(
 							Debug( LDAP_DEBUG_ANY,
 								"%s: line %d: %s\n",
 								fname, lineno, buf );
-							acl_usage();
+							return acl_usage();
 						}
 					}
 
@@ -1254,7 +1298,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: %s\n",
 							fname, lineno, buf );
-						acl_usage();
+						return acl_usage();
 					}
 
 
@@ -1277,7 +1321,7 @@ parse_acl(
 								b->a_group_oc->soc_oid );
 							Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
 								fname, lineno, buf );
-							acl_usage();
+							return acl_usage();
 						}
 					}
 					continue;
@@ -1299,7 +1343,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 						    fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || right[0] == '\0' ) {
@@ -1307,14 +1351,14 @@ parse_acl(
 							"missing \"=\" in (or value after) \"%s\" "
 							"in by clause.\n",
 							fname, lineno, left );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !BER_BVISEMPTY( &b->a_peername_pat ) ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"peername pattern already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					b->a_peername_style = sty;
@@ -1342,7 +1386,7 @@ parse_acl(
 								Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 									"illegal peername address \"%s\".\n",
 									fname, lineno, addr );
-								acl_usage();
+								return acl_usage();
 							}
 
 							b->a_peername_mask = (unsigned long)(-1);
@@ -1356,7 +1400,7 @@ parse_acl(
 										"illegal peername address mask "
 										"\"%s\".\n",
 										fname, lineno, mask );
-									acl_usage();
+									return acl_usage();
 								}
 							} 
 
@@ -1365,13 +1409,13 @@ parse_acl(
 								char	*end = NULL;
 
 								b->a_peername_port = strtol( port, &end, 10 );
-								if ( end[0] != '}' ) {
+								if ( end == port || end[0] != '}' ) {
 									/* illegal port */
 									Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 										"illegal peername port specification "
 										"\"{%s}\".\n",
 										fname, lineno, port );
-									acl_usage();
+									return acl_usage();
 								}
 							}
 						}
@@ -1393,7 +1437,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause\n",
 						    fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || right[0] == '\0' ) {
@@ -1401,14 +1445,14 @@ parse_acl(
 							"missing \"=\" in (or value after) \"%s\" "
 							"in by clause\n",
 							fname, lineno, left );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !BER_BVISNULL( &b->a_sockname_pat ) ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"sockname pattern already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					b->a_sockname_style = sty;
@@ -1451,7 +1495,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 						    fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || right[0] == '\0' ) {
@@ -1459,14 +1503,14 @@ parse_acl(
 							"missing \"=\" in (or value after) \"%s\" "
 							"in by clause.\n",
 							fname, lineno, left );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !BER_BVISEMPTY( &b->a_domain_pat ) ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: domain pattern already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					b->a_domain_style = sty;
@@ -1498,7 +1542,7 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 						    fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || right[0] == '\0' ) {
@@ -1506,14 +1550,14 @@ parse_acl(
 							"missing \"=\" in (or value after) \"%s\" "
 							"in by clause.\n",
 							fname, lineno, left );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !BER_BVISEMPTY( &b->a_sockurl_pat ) ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: sockurl pattern already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					b->a_sockurl_style = sty;
@@ -1551,21 +1595,21 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 							fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !BER_BVISEMPTY( &b->a_set_pat ) ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: set attribute already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || *right == '\0' ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: no set is defined.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					b->a_set_style = sty;
@@ -1578,11 +1622,18 @@ parse_acl(
 				{
 					char		*name = NULL,
 							*opts = NULL;
-					
+
+#if 1 /* tolerate legacy "aci" <who> */
 					if ( strcasecmp( left, "aci" ) == 0 ) {
+						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+							"undocumented deprecated \"aci\" directive "
+							"is superseded by \"dynacl/aci\".\n",
+							fname, lineno, 0 );
 						name = "aci";
 						
-					} else if ( strncasecmp( left, "dynacl/", STRLENOF( "dynacl/" ) ) == 0 ) {
+					} else
+#endif /* tolerate legacy "aci" <who> */
+					if ( strncasecmp( left, "dynacl/", STRLENOF( "dynacl/" ) ) == 0 ) {
 						name = &left[ STRLENOF( "dynacl/" ) ];
 						opts = strchr( name, '/' );
 						if ( opts ) {
@@ -1596,103 +1647,48 @@ parse_acl(
 							Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 								"unable to configure dynacl \"%s\".\n",
 								fname, lineno, name );
-							acl_usage();
+							return acl_usage();
 						}
 
 						continue;
 					}
 				}
-#else /* ! SLAP_DYNACL */
-
-#ifdef SLAPD_ACI_ENABLED
-				if ( strcasecmp( left, "aci" ) == 0 ) {
-					if (sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE) {
-						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
-							"inappropriate style \"%s\" in by clause.\n",
-						    fname, lineno, style );
-						acl_usage();
-					}
-
-					if( b->a_aci_at != NULL ) {
-						Debug( LDAP_DEBUG_ANY,
-							"%s: line %d: ACI attribute already specified.\n",
-							fname, lineno, 0 );
-						acl_usage();
-					}
-
-					if ( right != NULL && *right != '\0' ) {
-						rc = slap_str2ad( right, &b->a_aci_at, &text );
-
-						if( rc != LDAP_SUCCESS ) {
-							char	buf[ SLAP_TEXT_BUFLEN ];
-
-							snprintf( buf, sizeof( buf ),
-								"aci \"%s\": %s.",
-								right, text );
-							Debug( LDAP_DEBUG_ANY,
-								"%s: line %d: %s\n",
-								fname, lineno, buf );
-							acl_usage();
-						}
-
-					} else {
-						b->a_aci_at = slap_ad_aci;
-					}
-
-					if( !is_at_syntax( b->a_aci_at->ad_type,
-						SLAPD_ACI_SYNTAX) )
-					{
-						char	buf[ SLAP_TEXT_BUFLEN ];
-
-						snprintf( buf, sizeof( buf ),
-							"ACI \"%s\": inappropriate syntax: %s.",
-							right,
-							b->a_aci_at->ad_type->sat_syntax_oid );
-						Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n"
-							fname, lineno, buf );
-						acl_usage();
-					}
-
-					continue;
-				}
-#endif /* SLAPD_ACI_ENABLED */
-#endif /* ! SLAP_DYNACL */
+#endif /* SLAP_DYNACL */
 
 				if ( strcasecmp( left, "ssf" ) == 0 ) {
 					if ( sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 						    fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( b->a_authz.sai_ssf ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: ssf attribute already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || *right == '\0' ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: no ssf is defined.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
-					b->a_authz.sai_ssf = strtol( right, &next, 10 );
-					if ( next == NULL || next[0] != '\0' ) {
+					if ( lutil_atou( &b->a_authz.sai_ssf, right ) != 0 ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: unable to parse ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !b->a_authz.sai_ssf ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: invalid ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 					continue;
 				}
@@ -1702,36 +1698,35 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 							fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( b->a_authz.sai_transport_ssf ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"transport_ssf attribute already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || *right == '\0' ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: no transport_ssf is defined.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
-					b->a_authz.sai_transport_ssf = strtol( right, &next, 10 );
-					if ( next == NULL || next[0] != '\0' ) {
+					if ( lutil_atou( &b->a_authz.sai_transport_ssf, right ) != 0 ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"unable to parse transport_ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !b->a_authz.sai_transport_ssf ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: invalid transport_ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 					continue;
 				}
@@ -1741,36 +1736,35 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 							fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( b->a_authz.sai_tls_ssf ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"tls_ssf attribute already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || *right == '\0' ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: no tls_ssf is defined\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
-					b->a_authz.sai_tls_ssf = strtol( right, &next, 10 );
-					if ( next == NULL || next[0] != '\0' ) {
+					if ( lutil_atou( &b->a_authz.sai_tls_ssf, right ) != 0 ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"unable to parse tls_ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !b->a_authz.sai_tls_ssf ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: invalid tls_ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 					continue;
 				}
@@ -1780,36 +1774,35 @@ parse_acl(
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"inappropriate style \"%s\" in by clause.\n",
 							fname, lineno, style );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( b->a_authz.sai_sasl_ssf ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"sasl_ssf attribute already specified.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( right == NULL || *right == '\0' ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: no sasl_ssf is defined.\n",
 							fname, lineno, 0 );
-						acl_usage();
+						return acl_usage();
 					}
 
-					b->a_authz.sai_sasl_ssf = strtol( right, &next, 10 );
-					if ( next == NULL || next[0] != '\0' ) {
+					if ( lutil_atou( &b->a_authz.sai_sasl_ssf, right ) != 0 ) {
 						Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 							"unable to parse sasl_ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 
 					if ( !b->a_authz.sai_sasl_ssf ) {
 						Debug( LDAP_DEBUG_ANY,
 							"%s: line %d: invalid sasl_ssf value (%s).\n",
 							fname, lineno, right );
-						acl_usage();
+						return acl_usage();
 					}
 					continue;
 				}
@@ -1878,7 +1871,7 @@ parse_acl(
 				Debug( LDAP_DEBUG_ANY,
 					"%s: line %d: expecting <access> got \"%s\".\n",
 					fname, lineno, left );
-				acl_usage();
+				return acl_usage();
 			}
 
 			b->a_type = ACL_STOP;
@@ -1909,7 +1902,7 @@ parse_acl(
 				"%s: line %d: expecting \"to\" "
 				"or \"by\" got \"%s\"\n",
 				fname, lineno, argv[i] );
-			acl_usage();
+			return acl_usage();
 		}
 	}
 
@@ -1921,12 +1914,12 @@ parse_acl(
 			SLAPD_CONF_UNKNOWN_IGNORED ".\n",
 			fname, lineno, 0 );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-		acl_usage();
+		return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 
 	} else {
 #ifdef LDAP_DEBUG
-		if ( ldap_debug & LDAP_DEBUG_ACL ) {
+		if ( slap_debug & LDAP_DEBUG_ACL ) {
 			print_acl( be, a );
 		}
 #endif
@@ -1938,49 +1931,54 @@ parse_acl(
 				SLAPD_CONF_UNKNOWN_IGNORED ".\n",
 				fname, lineno, 0 );
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
-			acl_usage();
+			return acl_usage();
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
 		}
 
 		if ( be != NULL ) {
-			if ( !BER_BVISNULL( &be->be_nsuffix[ 1 ] ) ) {
+			if ( be->be_nsuffix == NULL ) {
 				Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
-					"scope checking only applies to single-valued "
-					"suffix databases\n",
+					"scope checking needs suffix before ACLs.\n",
 					fname, lineno, 0 );
 				/* go ahead, since checking is not authoritative */
-			}
-
-			switch ( check_scope( be, a ) ) {
-			case ACL_SCOPE_UNKNOWN:
-				Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
-					"cannot assess the validity of the ACL scope within "
-					"backend naming context\n",
-					fname, lineno, 0 );
-				break;
-
-			case ACL_SCOPE_WARN:
+			} else if ( !BER_BVISNULL( &be->be_nsuffix[ 1 ] ) ) {
 				Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
-					"ACL could be out of scope within backend naming context\n",
+					"scope checking only applies to single-valued "
+					"suffix databases\n",
 					fname, lineno, 0 );
-				break;
+				/* go ahead, since checking is not authoritative */
+			} else {
+				switch ( check_scope( be, a ) ) {
+				case ACL_SCOPE_UNKNOWN:
+					Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
+						"cannot assess the validity of the ACL scope within "
+						"backend naming context\n",
+						fname, lineno, 0 );
+					break;
 
-			case ACL_SCOPE_PARTIAL:
-				Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
-					"ACL appears to be partially out of scope within "
-					"backend naming context\n",
-					fname, lineno, 0 );
-				break;
+				case ACL_SCOPE_WARN:
+					Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
+						"ACL could be out of scope within backend naming context\n",
+						fname, lineno, 0 );
+					break;
 
-			case ACL_SCOPE_ERR:
-				Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
-					"ACL appears to be out of scope within "
-					"backend naming context\n",
-					fname, lineno, 0 );
-				break;
+				case ACL_SCOPE_PARTIAL:
+					Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
+						"ACL appears to be partially out of scope within "
+						"backend naming context\n",
+						fname, lineno, 0 );
+					break;
+	
+				case ACL_SCOPE_ERR:
+					Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
+						"ACL appears to be out of scope within "
+						"backend naming context\n",
+						fname, lineno, 0 );
+					break;
 
-			default:
-				break;
+				default:
+					break;
+				}
 			}
 			acl_append( &be->be_acl, a, pos );
 
@@ -1988,6 +1986,8 @@ parse_acl(
 			acl_append( &frontendDB->be_acl, a, pos );
 		}
 	}
+
+	return 0;
 }
 
 char *
@@ -2213,15 +2213,19 @@ str2accessmask( const char *str )
 	return mask;
 }
 
-static void
+static int
 acl_usage( void )
 {
-	Debug( LDAP_DEBUG_ANY, "%s%s%s\n",
+	char *access =
 		"<access clause> ::= access to <what> "
-				"[ by <who> <access> [ <control> ] ]+ \n"
-		"<what> ::= * | [dn[.<dnstyle>]=<DN>] [filter=<filter>] [attrs=<attrlist>]\n"
-		"<attrlist> ::= <attr> [val[/matchingRule][.<attrstyle>]=<value>] | <attr> , <attrlist>\n"
-		"<attr> ::= <attrname> | entry | children\n",
+				"[ by <who> <access> [ <control> ] ]+ \n";
+	char *what =
+		"<what> ::= * | [dn[.<dnstyle>]=<DN>] [filter=<filter>] [attrs=<attrspec>]\n"
+		"<attrspec> ::= <attrname> [val[/<matchingRule>][.<attrstyle>]=<value>] | <attrlist>\n"
+		"<attrlist> ::= <attr> [ , <attrlist> ]\n"
+		"<attr> ::= <attrname> | @<objectClass> | !<objectClass> | entry | children\n";
+
+	char *who =
 		"<who> ::= [ * | anonymous | users | self | dn[.<dnstyle>]=<DN> ]\n"
 			"\t[ realanonymous | realusers | realself | realdn[.<dnstyle>]=<DN> ]\n"
 			"\t[dnattr=<attrname>]\n"
@@ -2231,12 +2235,8 @@ acl_usage( void )
 			"\t[domain[.<domainstyle>]=<domain>] [sockurl[.<style>]=<url>]\n"
 #ifdef SLAP_DYNACL
 			"\t[dynacl/<name>[/<options>][.<dynstyle>][=<pattern>]]\n"
-#else /* ! SLAP_DYNACL */
-#ifdef SLAPD_ACI_ENABLED
-			"\t[aci[=<attrname>]]\n"
-#endif /* SLAPD_ACI_ENABLED */
-#endif /* ! SLAP_DYNACL */
-			"\t[ssf=<n>] [transport_ssf=<n>] [tls_ssf=<n>] [sasl_ssf=<n>]\n",
+#endif /* SLAP_DYNACL */
+			"\t[ssf=<n>] [transport_ssf=<n>] [tls_ssf=<n>] [sasl_ssf=<n>]\n"
 		"<style> ::= exact | regex | base(Object)\n"
 		"<dnstyle> ::= base(Object) | one(level) | sub(tree) | children | "
 			"exact | regex\n"
@@ -2254,8 +2254,11 @@ acl_usage( void )
 		"\t<name>=ACI\t<pattern>=<attrname>\n"
 #endif /* SLAPD_ACI_ENABLED */
 #endif /* ! SLAP_DYNACL */
-	);
-	exit( EXIT_FAILURE );
+		"";
+
+	Debug( LDAP_DEBUG_ANY, "%s%s%s\n", access, what, who );
+
+	return 1;
 }
 
 /*
@@ -2407,6 +2410,14 @@ acl_free( AccessControl *a )
 			free( an->an_name.bv_val );
 		}
 		free( a->acl_attrs );
+
+		if ( a->acl_attrval_style == ACL_STYLE_REGEX ) {
+			regfree( &a->acl_attrval_re );
+		}
+
+		if ( !BER_BVISNULL( &a->acl_attrval ) ) {
+			ber_memfree( a->acl_attrval.bv_val );
+		}
 	}
 	for ( ; a->acl_access; a->acl_access = n ) {
 		n = a->acl_access->a_next;
@@ -2669,13 +2680,6 @@ access2text( Access *b, char *ptr )
 			}
 		}
 	}
-#else /* ! SLAP_DYNACL */
-#ifdef SLAPD_ACI_ENABLED
-	if ( b->a_aci_at != NULL ) {
-		ptr = lutil_strcopy( ptr, " aci=" );
-		ptr = lutil_strcopy( ptr, b->a_aci_at->ad_cname.bv_val );
-	}
-#endif
 #endif /* SLAP_DYNACL */
 
 	/* Security Strength Factors */