From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 10 Oct 2006 13:36:55 +0000 (+0000)
Subject: Import ITS#4522 slapd.access(5) fix
X-Git-Tag: OPENLDAP_REL_ENG_2_3_28~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=855f2a31fe31f3c7ab6dc38156e1a808c131585a;p=openldap

Import ITS#4522 slapd.access(5) fix
---

diff --git a/CHANGES b/CHANGES
index 5342c9248f..71a8f56a92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,7 +19,8 @@ OpenLDAP 2.3.28 Engineering
 	Fixed slapo-ppolicy pwdChangedTime behavior (ITS#4692)
 	Fixed slapo-translucent ldapmodify crash (ITS#4673)
 	Documentation
-		Updated ldapsearch(1) options (ITS#4371, #4526, #4647)
+		Updated ldapsearch(1) options (ITS#4371,4526,4647)
+		Fixed slapd.access(5) non-optional dn= error (ITS#4522)
 
 OpenLDAP 2.3.27 Release
 	Fixed libldap dangling pointer issue (previous fix was broken) (ITS#4405)
diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5
index 0cbd3c8dac..37fb3f2977 100644
--- a/doc/man/man5/slapd.access.5
+++ b/doc/man/man5/slapd.access.5
@@ -67,7 +67,7 @@ brackets <>.
 .SH THE ACCESS DIRECTIVE
 The structure of the access control directives is
 .TP
-.B access to <what> "[ by <who> <access> [ <control> ] ]+"
+.B access to <what> "[ by <who> [ <access> ] [ <control> ] ]+"
 Grant access (specified by 
 .BR <access> ) 
 to a set of entries and/or attributes (specified by 
@@ -81,7 +81,7 @@ specifies the entity the access control directive applies to.
 It can have the forms
 .LP
 .nf
-	[dn[.<dnstyle>]=]<dnpattern>
+	dn[.<dnstyle>]=<dnpattern>
 	filter=<ldapfilter>
 	attrs=<attrlist>[ val[/matchingRule][.<attrstyle>]=<attrval>]
 .fi
@@ -99,9 +99,6 @@ with
 The statement
 .B dn=<dnpattern>
 selects the entries based on their naming context.
-The 
-.B dn=
-part is optional.
 The
 .B <dnpattern>
 is a string representation of the entry's DN.
@@ -113,11 +110,7 @@ form is given.
 .LP
 The 
 .B <dnstyle> 
-is also optional; however, it is recommended to specify both the 
-.B dn=
-and the
-.B <dnstyle>
-to avoid ambiguities.
+is optional; however, it is recommended to specify it to avoid ambiguities.
 .B Base 
 (synonym of
 .BR baseObject ),
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 65b54874f2..9dc18dbe86 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -2266,9 +2266,9 @@ acl_usage( void )
 {
 	char *access =
 		"<access clause> ::= access to <what> "
-				"[ by <who> <access> [ <control> ] ]+ \n";
+				"[ by <who> [ <access> ] [ <control> ] ]+ \n";
 	char *what =
-		"<what> ::= * | [dn[.<dnstyle>]=<DN>] [filter=<filter>] [attrs=<attrspec>]\n"
+		"<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";