Additional fix for ITS#4522. The "dn=" ist not optional.

This commit is contained in:
Ralf Haferkamp 2006-05-12 11:48:57 +00:00
parent 4d85c307c4
commit 4d46b8b747
2 changed files with 4 additions and 11 deletions

View File

@ -124,7 +124,7 @@ specifies the entity the access control directive applies to.
It can have the forms It can have the forms
.LP .LP
.nf .nf
[dn[.<dnstyle>]=]<dnpattern> dn[.<dnstyle>]=<dnpattern>
filter=<ldapfilter> filter=<ldapfilter>
attrs=<attrlist>[ val[/matchingRule][.<attrstyle>]=<attrval>] attrs=<attrlist>[ val[/matchingRule][.<attrstyle>]=<attrval>]
.fi .fi
@ -142,9 +142,6 @@ with
The statement The statement
.B dn=<dnpattern> .B dn=<dnpattern>
selects the entries based on their naming context. selects the entries based on their naming context.
The
.B dn=
part is optional.
The The
.B <dnpattern> .B <dnpattern>
is a string representation of the entry's DN. is a string representation of the entry's DN.
@ -156,11 +153,7 @@ form is given.
.LP .LP
The The
.B <dnstyle> .B <dnstyle>
is also optional; however, it is recommended to specify both the is optional; however, it is recommended to specify it to avoid ambiguities.
.B dn=
and the
.B <dnstyle>
to avoid ambiguities.
.B Base .B Base
(synonym of (synonym of
.BR baseObject ), .BR baseObject ),

View File

@ -2192,9 +2192,9 @@ acl_usage( void )
{ {
char *access = char *access =
"<access clause> ::= access to <what> " "<access clause> ::= access to <what> "
"[ by <who> <access> [ <control> ] ]+ \n"; "[ by <who> [ <access> ] [ <control> ] ]+ \n";
char *what = 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" "<attrspec> ::= <attrname> [val[/<matchingRule>][.<attrstyle>]=<value>] | <attrlist>\n"
"<attrlist> ::= <attr> [ , <attrlist> ]\n" "<attrlist> ::= <attr> [ , <attrlist> ]\n"
"<attr> ::= <attrname> | @<objectClass> | !<objectClass> | entry | children\n"; "<attr> ::= <attrname> | @<objectClass> | !<objectClass> | entry | children\n";