mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow 'sub' and 'subtree' in acl (fix ITS#2300)

Browse Source
This commit is contained in:
Pierangelo Masarati 2003-02-05 19:39:34 +00:00
parent fae57fcd15
commit 381e293b41
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/man/man5/slapd.access.5
View File

@ -95,6 +95,8 @@ for an exact match of the entry,
to indicate all the entries immediately below the
.BR pattern ,
.B sub
or
.B subtree
to indicate all the subentries of an entry including the entry itself,
.B children
to indicate all the subentries of an entry not including the entry itself.
@ -258,6 +260,8 @@ case apply.
The
.BR domain
clause also allows the
.B sub
or
.B subtree
style, which succeeds when a fully qualified name exactly matches the
.BR domain

6
servers/slapd/aclparse.c
View File

@ -185,7 +185,7 @@ parse_acl(
} else if ( strcasecmp( style, "one" ) == 0 ) {
a->acl_dn_style = ACL_STYLE_ONE;
ber_str2bv( right, 0, 1, &a->acl_dn_pat );
} else if ( strcasecmp( style, "subtree" ) == 0 ) {
} else if ( strcasecmp( style, "subtree" ) == 0 || strcasecmp( style, "sub" ) == 0 ) {
a->acl_dn_style = ACL_STYLE_SUBTREE;
ber_str2bv( right, 0, 1, &a->acl_dn_pat );
} else if ( strcasecmp( style, "children" ) == 0 ) {
@ -307,7 +307,7 @@ parse_acl(
sty = ACL_STYLE_BASE;
} else if ( strcasecmp( style, "one" ) == 0 ) {
sty = ACL_STYLE_ONE;
} else if ( strcasecmp( style, "subtree" ) == 0 ) {
} else if ( strcasecmp( style, "subtree" ) == 0 || strcasecmp( style, "sub" ) == 0 ) {
sty = ACL_STYLE_SUBTREE;
} else if ( strcasecmp( style, "children" ) == 0 ) {
sty = ACL_STYLE_CHILDREN;
@ -1282,7 +1282,7 @@ acl_usage( void )
"\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"
"<dnstyle> ::= regex | base | exact (alias of base) | one | sub[tree] | children\n"
"<style> ::= regex | base | exact (alias of base)\n"
"<groupflags> ::= R\n"
"<access> ::= [self]{<level>|<priv>}\n"