mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-12 15:10:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix slapacl when doing cross-database access checking

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-04-12 22:13:42 +00:00
parent da69eca714
commit 2430af4e8b
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/slapd/acl.c
View File

@ -427,8 +427,9 @@ access_allowed_mask(
}
if ( op->o_bd == NULL ) {
op->o_bd = LDAP_STAILQ_FIRST(&backendDB);
op->o_bd = LDAP_STAILQ_FIRST( &backendDB );
be_null = 1;
#ifdef LDAP_DEVEL
/*
* FIXME: experimental; use first backend rules
@ -436,7 +437,7 @@ access_allowed_mask(
if ( frontendDB->be_acl != NULL ) {
op->o_bd = frontendDB;
}
#endif
#endif /* LDAP_DEVEL */
}
assert( op->o_bd != NULL );

23
servers/slapd/slapacl.c
View File

@ -45,7 +45,6 @@ print_access(
int rc;
slap_mask_t mask;
char accessmaskbuf[ACCESSMASK_MAXLEN];
slap_access_t access = ACL_AUTH;
rc = access_allowed_mask( op, e, desc, nval, ACL_AUTH, NULL, &mask );
@ -71,9 +70,25 @@ slapacl( int argc, char **argv )
Entry e = { 0 }, *ep = &e;
char *attr = NULL;
int doclose = 0;
BackendDB *bd;
slap_tool_init( progname, SLAPACL, argc, argv );
if ( !dryrun ) {
int i = 0;
LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
if ( bd != be && backend_startup( bd ) ) {
fprintf( stderr, "backend_startup(#%d%s%s) failed\n",
i,
bd->be_suffix ? ": " : "",
bd->be_suffix ? bd->be_suffix[0].bv_val : "" );
rc = 1;
goto destroy;
}
}
}
argv = &argv[ optind ];
argc -= optind;
@ -339,6 +354,12 @@ destroy:;
if ( doclose ) {
be->be_entry_close( be );
}
LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
if ( bd != be ) {
backend_shutdown( bd );
}
}
}
slap_tool_destroy();