/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2007 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
static slap_overinst *overlays;
-enum db_which {
- db_open = 0,
- db_close,
- db_destroy,
- db_last
-};
-
-static int
-over_db_func(
- BackendDB *be,
- ConfigReply *cr,
- enum db_which which
-)
-{
- slap_overinfo *oi = be->bd_info->bi_private;
- slap_overinst *on = oi->oi_list;
- BackendInfo *bi_orig = be->bd_info;
- BI_db_open **func;
- int rc = 0;
-
- func = &oi->oi_orig->bi_db_open;
- if ( func[which] ) {
- be->bd_info = oi->oi_orig;
- rc = func[which]( be, cr );
- }
-
- for (; on && rc == 0; on=on->on_next) {
- be->bd_info = &on->on_bi;
- func = &on->on_bi.bi_db_open;
- if (func[which]) {
- rc = func[which]( be, cr );
- }
- }
- be->bd_info = bi_orig;
- return rc;
-}
-
static int
over_db_config(
BackendDB *be,
ca.be = be;
snprintf( ca.log, sizeof( ca.log ), "%s: line %d",
ca.fname, ca.lineno );
+ ca.op = SLAP_CONFIG_ADD;
+ ca.valx = -1;
for (; on; on=on->on_next) {
rc = SLAP_CONF_UNKNOWN;
ConfigReply *cr
)
{
- return over_db_func( be, cr, db_open );
+ slap_overinfo *oi = be->bd_info->bi_private;
+ slap_overinst *on = oi->oi_list;
+ BackendDB db = *be;
+ int rc = 0;
+
+ db.be_flags |= SLAP_DBFLAG_OVERLAY;
+ db.bd_info = oi->oi_orig;
+ if ( db.bd_info->bi_db_open ) {
+ rc = db.bd_info->bi_db_open( &db, cr );
+ }
+
+ for (; on && rc == 0; on=on->on_next) {
+ db.bd_info = &on->on_bi;
+ if ( db.bd_info->bi_db_open ) {
+ rc = db.bd_info->bi_db_open( &db, cr );
+ }
+ }
+
+ return rc;
}
static int
{
slap_overinfo *oi = be->bd_info->bi_private;
slap_overinst *on = oi->oi_list, *next;
- int rc;
+ BackendInfo *bi_orig = be->bd_info;
+ int rc = 0;
- rc = over_db_func( be, cr, db_destroy );
+ be->bd_info = oi->oi_orig;
+ if ( be->bd_info->bi_db_destroy ) {
+ rc = be->bd_info->bi_db_destroy( be, cr );
+ }
+ for (; on && rc == 0; on=on->on_next) {
+ be->bd_info = &on->on_bi;
+ if ( be->bd_info->bi_db_destroy ) {
+ rc = be->bd_info->bi_db_destroy( be, cr );
+ }
+ }
+
+ on = oi->oi_list;
if ( on ) {
for (next = on->on_next; on; on=next) {
next = on->on_next;
free( on );
}
}
-
+ be->bd_info = bi_orig;
free( oi );
return rc;
}
static int
over_access_allowed(
Operation *op,
- Entry *e,
- AttributeDescription *desc,
- struct berval *val,
- slap_access_t access,
- AccessControlState *state,
- slap_mask_t *maskp )
+ AclCheck *ak )
{
slap_overinfo *oi;
slap_overinst *on;
}
op->o_bd->bd_info = (BackendInfo *)on;
- rc = on->on_bi.bi_access_allowed( op, e,
- desc, val, access, state, maskp );
+ rc = on->on_bi.bi_access_allowed( op, ak );
if ( rc != SLAP_CB_CONTINUE ) break;
}
}
bi_access_allowed = slap_access_allowed;
}
- rc = bi_access_allowed( op, e,
- desc, val, access, state, maskp );
+ rc = bi_access_allowed( op, ak );
}
/* should not fall thru this far without anything happening... */
if ( rc == SLAP_CB_CONTINUE ) {
return rc;
}
+int
+overlay_callback_after_backover( Operation *op, slap_callback *sc, int append )
+{
+ slap_callback **scp;
+
+ for ( scp = &op->o_callback; *scp != NULL; scp = &(*scp)->sc_next ) {
+ if ( (*scp)->sc_response == over_back_response ) {
+ sc->sc_next = (*scp)->sc_next;
+ (*scp)->sc_next = sc;
+ return 0;
+ }
+ }
+
+ if ( append ) {
+ *scp = sc;
+ return 0;
+ }
+
+ return 1;
+}
+
/*
* default return code in case of missing backend function
* and overlay stack returning SLAP_CB_CONTINUE
slap_overinfo *oi;
slap_overinst *on;
BackendDB *be = op->o_bd, db;
- slap_callback cb = {NULL, over_back_response, NULL, NULL};
+ slap_callback cb = {NULL, over_back_response, NULL, NULL}, **sc;
int rc = SLAP_CB_CONTINUE;
/* FIXME: used to happen for instance during abandon
op->o_callback = &cb;
rc = overlay_op_walk( op, rs, which, oi, on );
+ for ( sc = &op->o_callback; *sc; sc = &(*sc)->sc_next ) {
+ if ( *sc == &cb ) {
+ *sc = cb.sc_next;
+ break;
+ }
+ }
op->o_bd = be;
- op->o_callback = cb.sc_next;
return rc;
}
/* add to all backends... */
LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
- if ( be == bd ) {
+ if ( bd == be->bd_self ) {
gotit = 1;
}
}
if ( !gotit ) {
- be->be_ctrls[ cid ] = 1;
- be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
+ be->bd_self->be_ctrls[ cid ] = 1;
+ be->bd_self->be_ctrls[ SLAP_MAX_CIDS ] = 1;
}
return 0;
}
}
+#ifdef SLAP_CONFIG_DELETE
+void
+overlay_remove( BackendDB *be, slap_overinst *on )
+{
+ slap_overinfo *oi = on->on_info;
+ slap_overinst **oidx;
+ BackendInfo *bi_orig;
+
+ /* remove overlay from oi_list an call db_close and db_destroy
+ * handlers */
+ for ( oidx = &oi->oi_list; *oidx; oidx = &(*oidx)->on_next ) {
+ if ( *oidx == on ) {
+ *oidx = on->on_next;
+ bi_orig = be->bd_info;
+ be->bd_info = (BackendInfo *)on;
+ if ( on->on_bi.bi_db_close ) {
+ on->on_bi.bi_db_close( be, NULL );
+ }
+ if ( on->on_bi.bi_db_destroy ) {
+ on->on_bi.bi_db_destroy( be, NULL );
+ }
+ be->bd_info = bi_orig;
+ free( on );
+ break;
+ }
+ }
+
+ /* clean up after removing last overlay */
+ if ( ! oi->oi_list )
+ {
+ /* reset db flags and bd_info to orig */
+ SLAP_DBFLAGS( be ) &= ~SLAP_DBFLAG_GLOBAL_OVERLAY;
+ be->bd_info = oi->oi_orig;
+ ch_free(oi);
+ }
+}
+#endif /* SLAP_CONFIG_DELETE */
+
void
overlay_insert( BackendDB *be, slap_overinst *on2, slap_overinst ***prev,
int idx )
/* add an overlay to a particular backend. */
int
-overlay_config( BackendDB *be, const char *ov, int idx, BackendInfo **res )
+overlay_config( BackendDB *be, const char *ov, int idx, BackendInfo **res, ConfigReply *cr )
{
slap_overinst *on = NULL, *on2 = NULL, **prev;
slap_overinfo *oi = NULL;
if ( on2->on_bi.bi_db_init ) {
int rc;
be->bd_info = (BackendInfo *)on2;
- rc = on2->on_bi.bi_db_init( be, NULL );
+ rc = on2->on_bi.bi_db_init( be, cr);
be->bd_info = (BackendInfo *)oi;
if ( rc ) {
*prev = on2->on_next;
projects / openldap / blobdiff