enum db_which which
)
{
- slap_overinfo *oi = (slap_overinfo *) be->bd_info;
+ 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;
rc = func[which]( be );
}
}
- be->bd_info = (BackendInfo *)oi;
+ be->bd_info = bi_orig;
return rc;
}
char **argv
)
{
- slap_overinfo *oi = (slap_overinfo *) be->bd_info;
+ slap_overinfo *oi = be->bd_info->bi_private;
slap_overinst *on = oi->oi_list;
+ BackendInfo *bi_orig = be->bd_info;
int rc = 0;
if ( oi->oi_orig->bi_db_config ) {
if ( rc != SLAP_CONF_UNKNOWN ) break;
}
}
- be->bd_info = (BackendInfo *)oi;
+ be->bd_info = bi_orig;
return rc;
}
BackendDB *be
)
{
- slap_overinfo *oi = (slap_overinfo *) be->bd_info;
+ slap_overinfo *oi = be->bd_info->bi_private;
slap_overinst *on = oi->oi_list, *next;
int rc;
op_abandon,
op_cancel,
op_extended,
+ op_aux_operational,
op_aux_chk_referrals,
op_last
};
LDAP_UNWILLING_TO_PERFORM, /* abandon */
LDAP_UNWILLING_TO_PERFORM, /* cancel */
LDAP_UNWILLING_TO_PERFORM, /* extended */
+ LDAP_SUCCESS, /* aux_operational */
LDAP_SUCCESS /* aux_chk_referrals */
};
enum op_which which
)
{
- slap_overinfo *oi = (slap_overinfo *) op->o_bd->bd_info;
+ slap_overinfo *oi = op->o_bd->bd_info->bi_private;
slap_overinst *on = oi->oi_list;
BI_op_bind **func;
BackendDB *be = op->o_bd, db = *op->o_bd;
}
}
- op->o_bd = be;
func = &oi->oi_orig->bi_op_bind;
if ( func[which] && rc == SLAP_CB_CONTINUE ) {
+ db.bd_info = oi->oi_orig;
rc = func[which]( op, rs );
}
/* should not fall thru this far without anything happening... */
if ( rc == SLAP_CB_CONTINUE ) {
rc = op_rc[ which ];
}
+ op->o_bd = be;
op->o_callback = cb.sc_next;
return rc;
}
}
static int
-over_chk_referrals( Operation *op, SlapReply *rs )
+over_aux_operational( Operation *op, SlapReply *rs )
+{
+ return over_op_func( op, rs, op_aux_operational );
+}
+
+static int
+over_aux_chk_referrals( Operation *op, SlapReply *rs )
{
return over_op_func( op, rs, op_aux_chk_referrals );
}
return 0;
}
+/*
+ * iterator on registered overlays; overlay_next( NULL ) returns the first
+ * overlay; * subsequent calls with the previously returned value allow to
+ * iterate * over the entire list; returns NULL when no more overlays are
+ * registered.
+ */
+
slap_overinst *
overlay_next(
slap_overinst *on
return on->on_next;
}
+/*
+ * returns a specific registered overlay based on the type; NULL if not
+ * registered.
+ */
+
+slap_overinst *
+overlay_find( const char *over_type )
+{
+ slap_overinst *on = overlays;
+
+ assert( over_type );
+
+ for ( ; on; on = on->on_next ) {
+ if ( strcmp( on->on_bi.bi_type, over_type ) == 0 ) {
+ break;
+ }
+ }
+
+ return on;
+}
+
static const char overtype[] = "over";
+/*
+ * returns TRUE (1) if the database is actually an overlay instance;
+ * FALSE (0) otherwise.
+ */
+
+int
+overlay_is_over( BackendDB *be )
+{
+ return be->bd_info->bi_type == overtype;
+}
+
+/*
+ * returns TRUE (1) if the given database is actually an overlay
+ * instance and, somewhere in the list, contains the requested overlay;
+ * FALSE (0) otherwise.
+ */
+
+int
+overlay_is_inst( BackendDB *be, const char *over_type )
+{
+ slap_overinst *on;
+
+ assert( be );
+
+ if ( !overlay_is_over( be ) ) {
+ return 0;
+ }
+
+ on = ((slap_overinfo *)be->bd_info->bi_private)->oi_list;
+ for ( ; on; on = on->on_next ) {
+ if ( strcmp( on->on_bi.bi_type, over_type ) == 0 ) {
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
/* add an overlay to a particular backend. */
int
overlay_config( BackendDB *be, const char *ov )
{
- slap_overinst *on = NULL, *on2 = NULL, *prev = NULL;
+ slap_overinst *on = NULL, *on2 = NULL;
slap_overinfo *oi = NULL;
BackendInfo *bi = NULL;
- for ( on = overlays; on; on=on->on_next ) {
- if (!strcmp( ov, on->on_bi.bi_type ) )
- break;
- }
+ on = overlay_find( ov );
if (!on) {
Debug( LDAP_DEBUG_ANY, "overlay %s not found\n", ov, 0, 0 );
return 1;
/* If this is the first overlay on this backend, set up the
* overlay info structure
*/
- if ( be->bd_info->bi_type != overtype ) {
+ if ( !overlay_is_over( be ) ) {
oi = ch_malloc( sizeof(slap_overinfo) );
oi->oi_orig = be->bd_info;
oi->oi_bi = *be->bd_info;
+
+ /* Save a pointer to ourself in bi_private.
+ * This allows us to keep working in conjunction
+ * with backglue...
+ */
+ oi->oi_bi.bi_private = oi;
oi->oi_list = NULL;
bi = (BackendInfo *)oi;
* all the hooks to share the same args
* of the operations...
*/
- bi->bi_chk_referrals = over_chk_referrals;
+ bi->bi_operational = over_aux_operational;
+ bi->bi_chk_referrals = over_aux_chk_referrals;
be->bd_info = bi;
} else {
- oi = (slap_overinfo *) be->bd_info;
+ oi = be->bd_info->bi_private;
}
-#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_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->on_info = oi;
on2->on_next = oi->oi_list;
oi->oi_list = on2;
-#endif
/* Any initialization needed? */
if ( on->on_bi.bi_db_init ) {