/* backover.c - backend overlay routines */
/* $OpenLDAP$ */
-/*
- * Copyright 2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-
-/*
- * Functions to overlay other modules over a backend.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
*
- * -- Howard Chu
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
+/* Functions to overlay other modules over a backend. */
+
#include "portable.h"
#include <stdio.h>
BI_db_open **func;
int rc = 0;
- func = &oi->oi_bi.bi_db_open;
+ func = &oi->oi_bd.bd_info->bi_db_open;
if ( func[which] ) {
rc = func[which]( &oi->oi_bd );
if ( rc ) return rc;
BackendDB bd;
int rc = 0;
- if ( oi->oi_bi.bi_db_config ) {
- rc = oi->oi_bi.bi_db_config( &oi->oi_bd, fname, lineno,
+ if ( oi->oi_bd.bd_info->bi_db_config ) {
+ rc = oi->oi_bd.bd_info->bi_db_config( &oi->oi_bd, fname, lineno,
argc, argv );
- if ( rc ) return rc;
+ if ( rc != SLAP_CONF_UNKNOWN ) return rc;
}
bd = *be;
if (on->on_bi.bi_db_config) {
rc = on->on_bi.bi_db_config( &bd, fname, lineno,
argc, argv );
- if ( rc ) break;
+ if ( rc != SLAP_CONF_UNKNOWN ) break;
}
}
return rc;
{
slap_overinfo *oi = (slap_overinfo *) op->o_bd->bd_info;
slap_overinst *on = oi->oi_list;
- int rc = 0;
+ int rc = SLAP_CB_CONTINUE;
BackendDB *be = op->o_bd, db = *op->o_bd;
- slap_callback *sc = op->o_callback->sc_private;
op->o_bd = &db;
for (; on; on=on->on_next ) {
if ( on->on_response ) {
db.bd_info = (BackendInfo *)on;
rc = on->on_response( op, rs );
- if ( rc ) break;
+ if ( rc != SLAP_CB_CONTINUE ) break;
}
}
- op->o_callback = sc;
- if ( rc == 0 && sc ) {
- rc = sc->sc_response( op, rs );
- }
op->o_bd = be;
return rc;
}
slap_overinst *on = oi->oi_list;
BI_op_bind **func;
BackendDB *be = op->o_bd, db = *op->o_bd;
- slap_callback cb = {over_back_response, NULL};
- int rc = 0;
+ slap_callback cb = {NULL, over_back_response, NULL, NULL};
+ int rc = SLAP_CB_CONTINUE;
op->o_bd = &db;
- cb.sc_private = op->o_callback;
+ cb.sc_next = op->o_callback;
op->o_callback = &cb;
for (; on; on=on->on_next ) {
if ( func[which] ) {
db.bd_info = (BackendInfo *)on;
rc = func[which]( op, rs );
- if ( rc ) break;
+ if ( rc != SLAP_CB_CONTINUE ) break;
}
}
- func = &oi->oi_bi.bi_op_bind;
- if ( func[which] ) {
+ op->o_bd = be;
+ func = &oi->oi_bd.bd_info->bi_op_bind;
+ if ( func[which] && rc == SLAP_CB_CONTINUE ) {
rc = func[which]( op, rs );
}
-
- op->o_bd = be;
+ /* should not fall thru this far without anything happening... */
+ if ( rc == SLAP_CB_CONTINUE ) {
+ rc = LDAP_UNWILLING_TO_PERFORM;
+ }
+ op->o_callback = cb.sc_next;
return rc;
}
return 0;
}
+slap_overinst *
+overlay_next(
+ slap_overinst *on
+)
+{
+ if ( on == NULL ) {
+ return overlays;
+ }
+
+ return on->on_next;
+}
+
static const char overtype[] = "over";
/* add an overlay to a particular backend. */
int
overlay_config( BackendDB *be, const char *ov )
{
- slap_overinst *on, *on2, *prev;
- slap_overinfo *oi;
- BackendInfo *bi;
+ slap_overinst *on = NULL, *on2 = NULL, *prev = NULL;
+ slap_overinfo *oi = NULL;
+ BackendInfo *bi = NULL;
for ( on = overlays; on; on=on->on_next ) {
if (!strcmp( ov, on->on_bi.bi_type ) )
return 1;
}
+ /* If this is the first overlay on this backend, set up the
+ * overlay info structure
+ */
if ( be->bd_info->bi_type != overtype ) {
oi = ch_malloc( sizeof(slap_overinfo) );
oi->oi_bd = *be;
bi->bi_extended = over_op_extended;
be->bd_info = bi;
+
+ } else {
+ oi = (slap_overinfo *) be->bd_info;
}
- oi = (slap_overinfo *) be->bd_info;
+#if 0
+ /* Walk to the end of the list of overlays, add the new
+ * one onto the end
+ */
for ( prev=NULL, on2 = oi->oi_list; on2; prev=on2, on2=on2->on_next );
- on2 = ch_malloc( sizeof(slap_overinst) );
+ on2 = ch_calloc( 1, sizeof(slap_overinst) );
if ( !prev ) {
oi->oi_list = on2;
} else {
prev->on_next = on2;
}
*on2 = *on;
+ on2->on_next = NULL;
+ on2->on_info = oi;
+#else
+ /* Insert new overlay on head of list. Overlays are executed
+ * in reverse of config order...
+ */
+ on2 = ch_calloc( 1, sizeof(slap_overinst) );
+ *on2 = *on;
+ on2->on_info = oi;
+ on2->on_next = oi->oi_list;
+ oi->oi_list = on2;
+#endif
+
+ /* Any initialization needed? */
+ if ( on->on_bi.bi_db_init ) {
+ be->bd_info = (BackendInfo *)on2;
+ on2->on_bi.bi_db_init( be );
+ be->bd_info = (BackendInfo *)oi;
+ }
return 0;
}