upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backout previous commit: frontendDB doesn't have the right rootn, ACLs and so

Browse source
This commit is contained in:
Pierangelo Masarati 2005-07-22 17:22:51 +00:00
parent 02870e815b
commit bccf2a7282
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
servers/slapd/acl.c
View file

@ -359,7 +359,6 @@ access_allowed_mask(
const char *attr;
int st_same_attr = 0;
static AccessControlState state_init = ACL_STATE_INIT;
BackendDB *be_orig;
assert( e != NULL );
assert( desc != NULL );
@ -430,15 +429,25 @@ access_allowed_mask(
/* this is enforced in backend_add() */
if ( op->o_bd->bd_info->bi_access_allowed ) {
/* delegate to backend */
ret = op->o_bd->bd_info->bi_access_allowed( op, e, desc, val, access, state, &mask );
ret = op->o_bd->bd_info->bi_access_allowed( op, e,
desc, val, access, state, &mask );
} else {
/* use default (but pass through frontend for global ACL overlays) */
be_orig = op->o_bd;
#if 0
/* FIXME: this doesn't work because frontendDB doesn't have
* the right rootn, ACLs and so. */
BackendDB *be_orig;
/* use default (but pass through frontend
* for global ACL overlays) */
be_orig = op->o_bd;
op->o_bd = frontendDB;
ret = frontendDB->bd_info->bi_access_allowed( op, e, desc, val, access, state, &mask );
ret = frontendDB->bd_info->bi_access_allowed( op, e,
desc, val, access, state, &mask );
op->o_bd = be_orig;
#endif
ret = slap_access_allowed( op, e,
desc, val, access, state, &mask );
}
if ( !ret ) {