/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2008 The OpenLDAP Foundation.
+ * Copyright 2003-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
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;
slap_overinfo *oi = be->bd_info->bi_private;
slap_overinst *on = oi->oi_list, *next;
BackendInfo *bi_orig = be->bd_info;
- int rc;
+ int rc = 0;
be->bd_info = oi->oi_orig;
if ( be->bd_info->bi_db_destroy ) {
{
slap_overinfo *oi;
slap_overinst *on;
- BackendInfo *bi = op->o_bd->bd_info;
+ BackendInfo *bi;
BackendDB *be = op->o_bd, db;
int rc = SLAP_CB_CONTINUE;
/* FIXME: used to happen for instance during abandon
* when global overlays are used... */
- assert( op->o_bd != NULL );
+ assert( be != NULL );
- oi = op->o_bd->bd_info->bi_private;
+ bi = be->bd_info;
+ oi = bi->bi_private;
on = oi->oi_list;
for ( ; on; on = on->on_next ) {
{
slap_overinfo *oi;
slap_overinst *on;
- BackendInfo *bi = op->o_bd->bd_info;
+ BackendInfo *bi;
BackendDB *be = op->o_bd, db;
int rc = SLAP_CB_CONTINUE;
/* FIXME: used to happen for instance during abandon
* when global overlays are used... */
- assert( op->o_bd != NULL );
+ assert( be != NULL );
- oi = op->o_bd->bd_info->bi_private;
+ bi = be->bd_info;
+ oi = bi->bi_private;
on = oi->oi_list;
for ( ; on; on = on->on_next ) {
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;
overlay_remove( BackendDB *be, slap_overinst *on )
{
slap_overinfo *oi = on->on_info;
- slap_overinst **oidx, *on2;
+ 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;
- BackendInfo *bi_orig = be->bd_info;
+ 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 );
on2->on_next = oi->oi_list;
oi->oi_list = on2;
} else {
- int i;
- slap_overinst *on, *otmp1 = NULL, *otmp2;
+ int i, novs;
+ slap_overinst *on, **prev;
/* Since the list is in reverse order and is singly linked,
- * we reverse it to find the idx insertion point. Adding
- * on overlay at a specific point should be a pretty
+ * we have to count the overlays and then insert backwards.
+ * Adding on overlay at a specific point should be a pretty
* infrequent occurrence.
*/
- for ( on = oi->oi_list; on; on=otmp2 ) {
- otmp2 = on->on_next;
- on->on_next = otmp1;
- otmp1 = on;
- }
- oi->oi_list = NULL;
+ novs = 0;
+ for ( on = oi->oi_list; on; on=on->on_next )
+ novs++;
+
+ if (idx > novs)
+ idx = 0;
+ else
+ idx = novs - idx;
+
/* advance to insertion point */
- for ( i=0, on = otmp1; i<idx; i++ ) {
- otmp1 = on->on_next;
- on->on_next = oi->oi_list;
- oi->oi_list = on;
+ prev = &oi->oi_list;
+ for ( i=0; i<idx; i++ ) {
+ on = *prev;
+ prev = &on->on_next;
}
/* insert */
- on2->on_next = oi->oi_list;
- oi->oi_list = on2;
- if ( otmp1 ) {
- *prev = &otmp1->on_next;
- /* replace remainder of list */
- for ( on=otmp1; on; on=otmp1 ) {
- otmp1 = on->on_next;
- on->on_next = oi->oi_list;
- oi->oi_list = on;
- }
- }
+ on2->on_next = *prev;
+ *prev = on2;
}
}