X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackover.c;h=90c395a40f5fab6241c95a5b96b0ec98f3cc6327;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=c09b5e6802168086141a8b0eee6239d9c29ba480;hpb=a85603c10bf32294ade8dbae064cdc1d43329040;p=openldap diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c index c09b5e6802..90c395a40f 100644 --- a/servers/slapd/backover.c +++ b/servers/slapd/backover.c @@ -25,6 +25,7 @@ #define SLAPD_TOOLS #include "slap.h" +#include "config.h" static slap_overinst *overlays; @@ -71,10 +72,14 @@ over_db_config( slap_overinfo *oi = be->bd_info->bi_private; slap_overinst *on = oi->oi_list; BackendInfo *bi_orig = be->bd_info; + struct ConfigOCs *be_cf_ocs = be->be_cf_ocs; + ConfigArgs ca = {0}; + ConfigTable *ct; int rc = 0; if ( oi->oi_orig->bi_db_config ) { be->bd_info = oi->oi_orig; + be->be_cf_ocs = oi->oi_orig->bi_cf_ocs; rc = oi->oi_orig->bi_db_config( be, fname, lineno, argc, argv ); @@ -123,8 +128,22 @@ over_db_config( if ( rc != SLAP_CONF_UNKNOWN ) return rc; } + ca.argv = argv; + ca.argc = argc; + ca.fname = fname; + ca.lineno = lineno; + ca.be = be; for (; on; on=on->on_next) { - if (on->on_bi.bi_db_config) { + rc = SLAP_CONF_UNKNOWN; + if (on->on_bi.bi_cf_ocs) { + ConfigTable *ct; + ca.bi = &on->on_bi; + ct = config_find_keyword( on->on_bi.bi_cf_ocs->co_table, &ca ); + if ( ct ) { + rc = config_add_vals( ct, &ca ); + } + } + if (on->on_bi.bi_db_config && rc == SLAP_CONF_UNKNOWN) { be->bd_info = &on->on_bi; rc = on->on_bi.bi_db_config( be, fname, lineno, argc, argv ); @@ -132,6 +151,8 @@ over_db_config( } } be->bd_info = bi_orig; + be->be_cf_ocs = be_cf_ocs; + return rc; } @@ -209,45 +230,6 @@ over_back_response ( Operation *op, SlapReply *rs ) 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, - op_aux_operational, - op_aux_chk_referrals, - op_aux_chk_controls, - 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 */ - SLAP_CB_CONTINUE, /* compare; pass to frontend */ - 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_operational */ - LDAP_SUCCESS, /* aux_chk_referrals */ - SLAP_CB_CONTINUE /* aux_chk_controls; pass to frontend */ -}; - #ifdef SLAP_OVERLAY_ACCESS static int over_access_allowed( @@ -261,6 +243,7 @@ over_access_allowed( { slap_overinfo *oi; slap_overinst *on; + BackendInfo *bi = op->o_bd->bd_info; BackendDB *be = op->o_bd, db; int rc = SLAP_CB_CONTINUE; @@ -287,14 +270,22 @@ over_access_allowed( } } - if ( rc == SLAP_CB_CONTINUE && oi->oi_orig->bi_access_allowed ) { + if ( rc == SLAP_CB_CONTINUE ) { + BI_access_allowed *bi_access_allowed; + /* if the database structure was changed, o_bd points to a * copy of the structure; put the original bd_info in place */ if ( SLAP_ISOVERLAY( op->o_bd ) ) { op->o_bd->bd_info = oi->oi_orig; } - rc = oi->oi_orig->bi_access_allowed( op, e, + if ( oi->oi_orig->bi_access_allowed ) { + bi_access_allowed = oi->oi_orig->bi_access_allowed; + } else { + bi_access_allowed = slap_access_allowed; + } + + rc = bi_access_allowed( op, e, desc, val, access, state, maskp ); } /* should not fall thru this far without anything happening... */ @@ -304,10 +295,51 @@ over_access_allowed( } op->o_bd = be; + op->o_bd->bd_info = bi; + return rc; } #endif /* SLAP_OVERLAY_ACCESS */ +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_operational, + op_aux_chk_referrals, + op_aux_chk_controls, + 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 */ + SLAP_CB_CONTINUE, /* compare; pass to frontend */ + 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_operational */ + LDAP_SUCCESS, /* aux_chk_referrals */ + SLAP_CB_CONTINUE /* aux_chk_controls; pass to frontend */ +}; + static int over_op_func( Operation *op, @@ -459,16 +491,23 @@ over_aux_chk_controls( Operation *op, SlapReply *rs ) return over_op_func( op, rs, op_aux_chk_controls ); } +enum conn_which { + conn_init = 0, + conn_destroy +}; + static int -over_connection_destroy( +over_connection_func( BackendDB *bd, - Connection *conn + Connection *conn, + enum conn_which which ) { - slap_overinfo *oi; - slap_overinst *on; - BackendDB db; - int rc = SLAP_CB_CONTINUE; + slap_overinfo *oi; + slap_overinst *on; + BackendDB db; + int rc = SLAP_CB_CONTINUE; + BI_connection_init **func; /* FIXME: used to happen for instance during abandon * when global overlays are used... */ @@ -477,23 +516,25 @@ over_connection_destroy( oi = bd->bd_info->bi_private; on = oi->oi_list; - if ( !SLAP_ISOVERLAY( bd )) { + 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 ) { + for ( ; on; on = on->on_next ) { + func = &on->on_bi.bi_connection_init; + if ( func[ which ] ) { bd->bd_info = (BackendInfo *)on; - rc = on->on_bi.bi_connection_destroy( bd, conn ); + rc = func[ which ]( bd, conn ); if ( rc != SLAP_CB_CONTINUE ) break; } } - if ( oi->oi_orig->bi_connection_destroy && rc == SLAP_CB_CONTINUE ) { + func = &oi->oi_orig->bi_connection_init; + if ( func[ which ] && rc == SLAP_CB_CONTINUE ) { bd->bd_info = oi->oi_orig; - rc = oi->oi_orig->bi_connection_destroy( bd, conn ); + rc = func[ which ]( bd, conn ); } /* should not fall thru this far without anything happening... */ if ( rc == SLAP_CB_CONTINUE ) { @@ -503,6 +544,24 @@ over_connection_destroy( return rc; } +static int +over_connection_init( + BackendDB *bd, + Connection *conn +) +{ + return over_connection_func( bd, conn, conn_init ); +} + +static int +over_connection_destroy( + BackendDB *bd, + Connection *conn +) +{ + return over_connection_func( bd, conn, conn_destroy ); +} + int overlay_register( slap_overinst *on @@ -627,6 +686,27 @@ overlay_register_control( BackendDB *be, const char *oid ) return rc; } +void +overlay_destroy_one( BackendDB *be, slap_overinst *on ) +{ + slap_overinfo *oi = on->on_info; + slap_overinst **oidx; + + for ( oidx = &oi->oi_list; *oidx; oidx = &(*oidx)->on_next ) { + if ( *oidx == on ) { + *oidx = on->on_next; + if ( on->on_bi.bi_db_destroy ) { + BackendInfo *bi_orig = be->bd_info; + be->bd_info = (BackendInfo *)on; + on->on_bi.bi_db_destroy( be ); + be->bd_info = bi_orig; + } + free( on ); + break; + } + } +} + /* add an overlay to a particular backend. */ int overlay_config( BackendDB *be, const char *ov ) @@ -697,6 +777,7 @@ overlay_config( BackendDB *be, const char *ov ) bi->bi_access_allowed = over_access_allowed; #endif /* SLAP_OVERLAY_ACCESS */ + bi->bi_connection_init = over_connection_init; bi->bi_connection_destroy = over_connection_destroy; be->bd_info = bi;