From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 12 Jan 2005 14:25:08 +0000 (+0000)
Subject: cosmetic changes
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~414
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b381e1bcc8686cf449d02499607f0e12046ebdae;p=openldap

cosmetic changes
---

diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5
index 68ad715b54..be14cf19fb 100644
--- a/doc/man/man5/slapd.access.5
+++ b/doc/man/man5/slapd.access.5
@@ -190,20 +190,19 @@ form is given,
 is implied, i.e. all attributes are addressed.
 .LP
 Using the form
-.B attrs=<attr> val[.<style>]=<attrval>
+.B attrs=<attr> val[.<attrstyle>]=<attrval>
 specifies access to a particular value of a single attribute.
-In this case, only a single attribute type may be given. A value
-.B <style>
-of
+In this case, only a single attribute type may be given. The
+.B <attrstyle>
 .B exact
 (the default) uses the attribute's equality matching rule to compare the
-value. If the value
-.B <style>
+value. If the
+.B <attrstyle>
 is
 .BR regex ,
 the provided value is used as a POSIX (''extended'') regular
-expression pattern.  If the attribute has DN syntax, the value
-.B <style>
+expression pattern.  If the attribute has DN syntax, the 
+.B <attrstyle>
 can be any of
 .BR base ,
 .BR onelevel ,
diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 0150d1c7e9..623f0b18a2 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -541,8 +541,11 @@ acl_get(
 				Debug( LDAP_DEBUG_ACL,
 					"acl_get: valpat %s\n",
 					a->acl_attrval.bv_val, 0, 0 );
-				if (regexec(&a->acl_attrval_re, val->bv_val, 0, NULL, 0))
+				if ( regexec( &a->acl_attrval_re, val->bv_val, 0, NULL, 0 ) )
+				{
 					continue;
+				}
+
 			} else {
 				int match = 0;
 				const char *text;
@@ -2113,8 +2116,9 @@ aci_match_set (
 	int		rc = 0;
 	AciSetCookie	cookie;
 
-	if (setref == 0) {
+	if ( setref == 0 ) {
 		ber_dupbv_x( &set, subj, op->o_tmpmemctx );
+
 	} else {
 		struct berval		subjdn, ndn = BER_BVNULL;
 		struct berval		setat;
@@ -2124,7 +2128,7 @@ aci_match_set (
 
 		/* format of string is "entry/setAttrName" */
 		if ( aci_get_part( subj, 0, '/', &subjdn ) < 0 ) {
-			return(0);
+			return 0;
 		}
 
 		if ( aci_get_part( subj, 1, '/', &setat ) < 0 ) {
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 516fa0aaca..d682ef7c51 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -504,7 +504,7 @@ parse_acl(
 									a->acl_attrs[0].an_desc->ad_cname.bv_val );
 								a->acl_attrval_style = ACL_STYLE_BASE;
 							}
-							
+
 						} else {
 							fprintf( stderr, 
 								"%s: line %d: unknown val.<style> \"%s\" "
@@ -1898,7 +1898,7 @@ acl_usage( void )
 		"<access clause> ::= access to <what> "
 				"[ by <who> <access> [ <control> ] ]+ \n"
 		"<what> ::= * | [dn[.<dnstyle>]=<DN>] [filter=<filter>] [attrs=<attrlist>]\n"
-		"<attrlist> ::= <attr> [val[.<style>]=<value>] | <attr> , <attrlist>\n"
+		"<attrlist> ::= <attr> [val[.<attrstyle>]=<value>] | <attr> , <attrlist>\n"
 		"<attr> ::= <attrname> | entry | children\n",
 		"<who> ::= [ * | anonymous | users | self | dn[.<dnstyle>]=<DN> ]\n"
 			"\t[dnattr=<attrname>]\n"
@@ -1909,9 +1909,11 @@ acl_usage( void )
 			"\t[aci=<attrname>]\n"
 #endif
 			"\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"
-		"<style> ::= exact | regex | base(Object)\n"
+		"<attrstyle> ::= exact | regex | base(Object) | one(level) | "
+			"sub(tree) | children\n"
 		"<peernamestyle> ::= exact | regex | ip | path\n"
 		"<domainstyle> ::= exact | regex | base(Object) | sub(tree)\n"
 		"<access> ::= [self]{<level>|<priv>}\n"