X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackover.c;h=f4b82dc0be0a2a85631af89810ea3a15aa6b460c;hb=d7396583d5bac01fda89da592824b1c8179984f4;hp=5547bcd6c48ed8a9734c644ab201b0a918089e12;hpb=30333b989c5317dfdf776ffa7a4a85004bb3eac3;p=openldap diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c index 5547bcd6c4..f4b82dc0be 100644 --- a/servers/slapd/backover.c +++ b/servers/slapd/backover.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2003-2004 The OpenLDAP Foundation. + * Copyright 2003-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -160,7 +160,7 @@ over_db_close( } } - if ( be->bd_info->bi_db_close ) { + if ( oi->oi_orig->bi_db_close ) { be->bd_info = oi->oi_orig; rc = be->bd_info->bi_db_close( be ); } @@ -223,6 +223,7 @@ enum op_which { op_extended, op_aux_operational, op_aux_chk_referrals, + op_aux_chk_controls, op_last }; @@ -234,7 +235,7 @@ static int op_rc[] = { LDAP_UNWILLING_TO_PERFORM, /* bind */ LDAP_UNWILLING_TO_PERFORM, /* unbind */ LDAP_UNWILLING_TO_PERFORM, /* search */ - LDAP_UNWILLING_TO_PERFORM, /* compare */ + SLAP_CB_CONTINUE, /* compare; pass to frontend */ LDAP_UNWILLING_TO_PERFORM, /* modify */ LDAP_UNWILLING_TO_PERFORM, /* modrdn */ LDAP_UNWILLING_TO_PERFORM, /* add */ @@ -243,7 +244,8 @@ static int op_rc[] = { LDAP_UNWILLING_TO_PERFORM, /* cancel */ LDAP_UNWILLING_TO_PERFORM, /* extended */ LDAP_SUCCESS, /* aux_operational */ - LDAP_SUCCESS /* aux_chk_referrals */ + LDAP_SUCCESS, /* aux_chk_referrals */ + SLAP_CB_CONTINUE /* aux_chk_controls; pass to frontend */ }; static int @@ -253,15 +255,25 @@ over_op_func( enum op_which which ) { - slap_overinfo *oi = op->o_bd->bd_info->bi_private; - slap_overinst *on = oi->oi_list; + slap_overinfo *oi; + slap_overinst *on; BI_op_bind **func; - BackendDB *be = op->o_bd, db = *op->o_bd; + BackendDB *be = op->o_bd, db; slap_callback cb = {NULL, over_back_response, NULL, NULL}; int rc = SLAP_CB_CONTINUE; - db.be_flags |= SLAP_DBFLAG_OVERLAY; - op->o_bd = &db; + /* FIXME: used to happen for instance during abandon + * when global overlays are used... */ + assert( op->o_bd != NULL ); + + oi = op->o_bd->bd_info->bi_private; + on = oi->oi_list; + + if ( !SLAP_ISOVERLAY( op->o_bd )) { + db = *op->o_bd; + db.be_flags |= SLAP_DBFLAG_OVERLAY; + op->o_bd = &db; + } cb.sc_next = op->o_callback; cb.sc_private = oi; op->o_callback = &cb; @@ -269,7 +281,7 @@ over_op_func( for (; on; on=on->on_next ) { func = &on->on_bi.bi_op_bind; if ( func[which] ) { - db.bd_info = (BackendInfo *)on; + op->o_bd->bd_info = (BackendInfo *)on; rc = func[which]( op, rs ); if ( rc != SLAP_CB_CONTINUE ) break; } @@ -277,13 +289,27 @@ over_op_func( func = &oi->oi_orig->bi_op_bind; if ( func[which] && rc == SLAP_CB_CONTINUE ) { - db.bd_info = oi->oi_orig; + op->o_bd->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 ]; } + + /* The underlying backend didn't handle the request, make sure + * overlay cleanup is processed. + */ + if ( rc == LDAP_UNWILLING_TO_PERFORM ) { + slap_callback *sc_next; + for ( ; op->o_callback && op->o_callback != cb.sc_next; + op->o_callback = sc_next ) { + sc_next = op->o_callback->sc_next; + if ( op->o_callback->sc_cleanup ) { + op->o_callback->sc_cleanup( op, rs ); + } + } + } op->o_bd = be; op->o_callback = cb.sc_next; return rc; @@ -367,6 +393,56 @@ over_aux_chk_referrals( Operation *op, SlapReply *rs ) return over_op_func( op, rs, op_aux_chk_referrals ); } +static int +over_aux_chk_controls( Operation *op, SlapReply *rs ) +{ + return over_op_func( op, rs, op_aux_chk_controls ); +} + +static int +over_connection_destroy( + BackendDB *bd, + Connection *conn +) +{ + slap_overinfo *oi; + slap_overinst *on; + BackendDB db; + int rc = SLAP_CB_CONTINUE; + + /* FIXME: used to happen for instance during abandon + * when global overlays are used... */ + assert( bd != NULL ); + + oi = bd->bd_info->bi_private; + on = oi->oi_list; + + if ( !SLAP_ISOVERLAY( bd )) { + db = *bd; + db.be_flags |= SLAP_DBFLAG_OVERLAY; + bd = &db; + } + + for (; on; on=on->on_next ) { + if ( on->on_bi.bi_connection_destroy ) { + bd->bd_info = (BackendInfo *)on; + rc = on->on_bi.bi_connection_destroy( bd, conn ); + if ( rc != SLAP_CB_CONTINUE ) break; + } + } + + if ( oi->oi_orig->bi_connection_destroy && rc == SLAP_CB_CONTINUE ) { + bd->bd_info = oi->oi_orig; + rc = oi->oi_orig->bi_connection_destroy( bd, conn ); + } + /* should not fall thru this far without anything happening... */ + if ( rc == SLAP_CB_CONTINUE ) { + rc = LDAP_UNWILLING_TO_PERFORM; + } + + return rc; +} + int overlay_register( slap_overinst *on @@ -457,6 +533,40 @@ overlay_is_inst( BackendDB *be, const char *over_type ) return 0; } +int +overlay_register_control( BackendDB *be, const char *oid ) +{ + int rc = 0; + int gotit = 0; + int cid; + + if ( slap_find_control_id( oid, &cid ) == LDAP_CONTROL_NOT_FOUND ) { + return -1; + } + + if ( SLAP_DBFLAGS( be ) & SLAP_DBFLAG_GLOBAL_OVERLAY ) { + BackendDB *bd; + + /* add to all backends... */ + LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) { + if ( be == bd ) { + gotit = 1; + } + + bd->be_ctrls[ cid ] = 1; + bd->be_ctrls[ SLAP_MAX_CIDS ] = 1; + } + + } + + if ( rc == 0 && !gotit ) { + be->be_ctrls[ cid ] = 1; + be->be_ctrls[ SLAP_MAX_CIDS ] = 1; + } + + return rc; +} + /* add an overlay to a particular backend. */ int overlay_config( BackendDB *be, const char *ov ) @@ -479,9 +589,14 @@ overlay_config( BackendDB *be, const char *ov ) oi->oi_orig = be->bd_info; oi->oi_bi = *be->bd_info; + /* NOTE: the first time a global overlay is configured, + * frontendDB gets this flag; it is used later by overlays + * to determine if they're stacked on top of the frontendDB */ + if ( oi->oi_orig == frontendDB->bd_info ) { + SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_GLOBAL_OVERLAY; + } + /* 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; @@ -515,6 +630,9 @@ overlay_config( BackendDB *be, const char *ov ) */ bi->bi_operational = over_aux_operational; bi->bi_chk_referrals = over_aux_chk_referrals; + bi->bi_chk_controls = over_aux_chk_controls; + + bi->bi_connection_destroy = over_connection_destroy; be->bd_info = bi; @@ -539,9 +657,11 @@ overlay_config( BackendDB *be, const char *ov ) /* Any initialization needed? */ if ( on->on_bi.bi_db_init ) { + int rc; be->bd_info = (BackendInfo *)on2; - on2->on_bi.bi_db_init( be ); + rc = on2->on_bi.bi_db_init( be ); be->bd_info = (BackendInfo *)oi; + if ( rc ) return rc; } return 0;