/* 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.
*
- * -- Howard Chu
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * 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>
{
slap_overinfo *oi = (slap_overinfo *) be->bd_info;
slap_overinst *on = oi->oi_list;
- BackendDB bd;
BI_db_open **func;
int rc = 0;
- func = &oi->oi_bd.bd_info->bi_db_open;
+ func = &oi->oi_orig->bi_db_open;
if ( func[which] ) {
- rc = func[which]( &oi->oi_bd );
- if ( rc ) return rc;
+ be->bd_info = oi->oi_orig;
+ rc = func[which]( be );
}
- bd = *be;
- for (; on; on=on->on_next) {
- bd.bd_info = &on->on_bi;
+ 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]( &bd );
- if ( rc ) break;
+ rc = func[which]( be );
}
}
+ be->bd_info = (BackendInfo *)oi;
return rc;
}
{
slap_overinfo *oi = (slap_overinfo *) be->bd_info;
slap_overinst *on = oi->oi_list;
- BackendDB bd;
int rc = 0;
- if ( oi->oi_bd.bd_info->bi_db_config ) {
- rc = oi->oi_bd.bd_info->bi_db_config( &oi->oi_bd, fname, lineno,
+ if ( oi->oi_orig->bi_db_config ) {
+ be->bd_info = oi->oi_orig;
+ rc = oi->oi_orig->bi_db_config( be, fname, lineno,
argc, argv );
- if ( rc ) return rc;
+ be->bd_info = (BackendInfo *)oi;
+ if ( rc != SLAP_CONF_UNKNOWN ) return rc;
}
- bd = *be;
for (; on; on=on->on_next) {
- bd.bd_info = &on->on_bi;
if (on->on_bi.bi_db_config) {
- rc = on->on_bi.bi_db_config( &bd, fname, lineno,
+ be->bd_info = &on->on_bi;
+ rc = on->on_bi.bi_db_config( be, fname, lineno,
argc, argv );
- if ( rc ) break;
+ if ( rc != SLAP_CONF_UNKNOWN ) break;
}
}
+ be->bd_info = (BackendInfo *)oi;
return rc;
}
static int
over_back_response ( Operation *op, SlapReply *rs )
{
- slap_overinfo *oi = (slap_overinfo *) op->o_bd->bd_info;
+ slap_overinfo *oi = op->o_callback->sc_private;
slap_overinst *on = oi->oi_list;
int rc = SLAP_CB_CONTINUE;
BackendDB *be = op->o_bd, db = *op->o_bd;
- slap_callback *sc = op->o_callback->sc_private;
- slap_callback *s0 = op->o_callback;
op->o_bd = &db;
- op->o_callback = sc;
for (; on; on=on->on_next ) {
if ( on->on_response ) {
db.bd_info = (BackendInfo *)on;
if ( rc != SLAP_CB_CONTINUE ) break;
}
}
- if ( sc && (rc == SLAP_CB_CONTINUE) ) {
- rc = sc->sc_response( op, rs );
- }
op->o_bd = be;
- op->o_callback = s0;
return rc;
}
-enum op_which { op_bind = 0, op_unbind, op_search, op_compare,
- op_modify, op_modrdn, op_add, op_delete, op_abandon,
- op_cancel, op_extended };
+enum op_which {
+ op_bind = 0,
+ op_unbind,
+ op_search,
+ op_compare,
+ op_modify,
+ op_modrdn,
+ op_add,
+ op_delete,
+ op_abandon,
+ op_cancel,
+ op_extended,
+ op_aux_chk_referrals,
+ op_last
+};
+
+/*
+ * default return code in case of missing backend function
+ * and overlay stack returning SLAP_CB_CONTINUE
+ */
+static int op_rc[] = {
+ LDAP_UNWILLING_TO_PERFORM, /* bind */
+ LDAP_UNWILLING_TO_PERFORM, /* unbind */
+ LDAP_UNWILLING_TO_PERFORM, /* search */
+ LDAP_UNWILLING_TO_PERFORM, /* compare */
+ LDAP_UNWILLING_TO_PERFORM, /* modify */
+ LDAP_UNWILLING_TO_PERFORM, /* modrdn */
+ LDAP_UNWILLING_TO_PERFORM, /* add */
+ LDAP_UNWILLING_TO_PERFORM, /* delete */
+ LDAP_UNWILLING_TO_PERFORM, /* abandon */
+ LDAP_UNWILLING_TO_PERFORM, /* cancel */
+ LDAP_UNWILLING_TO_PERFORM, /* extended */
+ LDAP_SUCCESS /* aux_chk_referrals */
+};
static int
over_op_func(
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;
+ cb.sc_private = oi;
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_bd.bd_info->bi_op_bind;
- if ( func[which] ) {
+ op->o_bd = be;
+ func = &oi->oi_orig->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 = op_rc[ which ];
+ }
+ op->o_callback = cb.sc_next;
return rc;
}
return over_op_func( op, rs, op_extended );
}
+static int
+over_chk_referrals( Operation *op, SlapReply *rs )
+{
+ return over_op_func( op, rs, op_aux_chk_referrals );
+}
+
int
overlay_register(
slap_overinst *on
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 ) )
*/
if ( be->bd_info->bi_type != overtype ) {
oi = ch_malloc( sizeof(slap_overinfo) );
- oi->oi_bd = *be;
+ oi->oi_orig = be->bd_info;
oi->oi_bi = *be->bd_info;
oi->oi_list = NULL;
bi = (BackendInfo *)oi;
bi->bi_op_delete = over_op_delete;
bi->bi_op_abandon = over_op_abandon;
bi->bi_op_cancel = over_op_cancel;
+
bi->bi_extended = over_op_extended;
+ /*
+ * this is fine because it has the same
+ * args of the operations; we need to rework
+ * all the hooks to share the same args
+ * of the operations...
+ */
+ bi->bi_chk_referrals = over_chk_referrals;
+
be->bd_info = bi;
+
+ } else {
+ oi = (slap_overinfo *) be->bd_info;
}
+#if 0
/* Walk to the end of the list of overlays, add the new
* one onto the end
*/
- oi = (slap_overinfo *) be->bd_info;
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 {
}
*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 ) {
projects / openldap / blobdiff