X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-monitor%2Finit.c;h=dc6975ab344d79eff3401ed9ef8346a0ae7b56c4;hb=45d87c22a95dc0c2455de3df776c689966d0f02f;hp=26d7d5edf4ca591935d78b02ed74ab0fb80162fd;hpb=127ac65c447b8d28ba3cd75e1b8cee28006d5472;p=openldap diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c index 26d7d5edf4..dc6975ab34 100644 --- a/servers/slapd/back-monitor/init.c +++ b/servers/slapd/back-monitor/init.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2001-2006 The OpenLDAP Foundation. + * Copyright 2001-2009 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * All rights reserved. * @@ -30,6 +30,8 @@ #include "lber_pvt.h" #include "back-monitor.h" +#include "config.h" + #undef INTEGRATE_CORE_SCHEMA /* @@ -44,6 +46,27 @@ BackendDB *be_monitor; static struct monitor_subsys_t **monitor_subsys; static int monitor_subsys_opened; static monitor_info_t monitor_info; +static const monitor_extra_t monitor_extra = { + monitor_back_is_configured, + monitor_back_get_subsys, + monitor_back_get_subsys_by_dn, + + monitor_back_register_subsys, + monitor_back_register_backend, + monitor_back_register_database, + monitor_back_register_overlay_info, + monitor_back_register_overlay, + monitor_back_register_entry, + monitor_back_register_entry_parent, + monitor_back_register_entry_attrs, + monitor_back_register_entry_callback, + + monitor_back_unregister_entry, + monitor_back_unregister_entry_parent, + monitor_back_unregister_entry_attrs, + monitor_back_unregister_entry_callback +}; + /* * subsystem data @@ -202,6 +225,12 @@ static struct monitor_subsys_t known_monitor_subsys[] = { }, { NULL } }; +int +monitor_subsys_is_opened( void ) +{ + return monitor_subsys_opened; +} + int monitor_back_register_subsys( monitor_subsys_t *ms ) @@ -226,7 +255,7 @@ monitor_back_register_subsys( /* if a subsystem is registered __AFTER__ subsystem * initialization (depending on the sequence the databases * are listed in slapd.conf), init it */ - if ( monitor_subsys_opened ) { + if ( monitor_subsys_is_opened() ) { /* FIXME: this should only be possible * if be_monitor is already initialized */ @@ -246,18 +275,29 @@ enum { LIMBO_ENTRY, LIMBO_ENTRY_PARENT, LIMBO_ATTRS, - LIMBO_CB + LIMBO_CB, + LIMBO_BACKEND, + LIMBO_DATABASE, + LIMBO_OVERLAY_INFO, + LIMBO_OVERLAY, + + LIMBO_LAST }; typedef struct entry_limbo_t { int el_type; + BackendInfo *el_bi; + BackendDB *el_be; + slap_overinst *el_on; Entry *el_e; Attribute *el_a; - struct berval el_ndn; - struct berval el_base; + struct berval *el_ndn; + struct berval el_nbase; int el_scope; struct berval el_filter; monitor_callback_t *el_cb; + monitor_subsys_t *el_mss; + unsigned long el_flags; struct entry_limbo_t *el_next; } entry_limbo_t; @@ -267,10 +307,116 @@ monitor_back_is_configured( void ) return be_monitor != NULL; } +int +monitor_back_register_backend( + BackendInfo *bi ) +{ + return -1; +} + +int +monitor_back_register_overlay_info( + slap_overinst *on ) +{ + return -1; +} + +int +monitor_back_register_backend_limbo( + BackendInfo *bi ) +{ + return -1; +} + +int +monitor_back_register_database_limbo( + BackendDB *be, + struct berval *ndn_out ) +{ + entry_limbo_t **elpp, el = { 0 }; + monitor_info_t *mi; + + if ( be_monitor == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_back_register_database_limbo: " + "monitor database not configured.\n", + 0, 0, 0 ); + return -1; + } + + mi = ( monitor_info_t * )be_monitor->be_private; + + + el.el_type = LIMBO_DATABASE; + + el.el_be = be->bd_self; + el.el_ndn = ndn_out; + + for ( elpp = &mi->mi_entry_limbo; + *elpp; + elpp = &(*elpp)->el_next ) + /* go to last */; + + *elpp = (entry_limbo_t *)ch_malloc( sizeof( entry_limbo_t ) ); + + el.el_next = NULL; + **elpp = el; + + return 0; +} + +int +monitor_back_register_overlay_info_limbo( + slap_overinst *on ) +{ + return -1; +} + +int +monitor_back_register_overlay_limbo( + BackendDB *be, + struct slap_overinst *on, + struct berval *ndn_out ) +{ + entry_limbo_t **elpp, el = { 0 }; + monitor_info_t *mi; + + if ( be_monitor == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_back_register_overlay_limbo: " + "monitor database not configured.\n", + 0, 0, 0 ); + return -1; + } + + mi = ( monitor_info_t * )be_monitor->be_private; + + + el.el_type = LIMBO_OVERLAY; + + el.el_be = be->bd_self; + el.el_on = on; + el.el_ndn = ndn_out; + + for ( elpp = &mi->mi_entry_limbo; + *elpp; + elpp = &(*elpp)->el_next ) + /* go to last */; + + *elpp = (entry_limbo_t *)ch_malloc( sizeof( entry_limbo_t ) ); + + el.el_next = NULL; + **elpp = el; + + return 0; +} + int monitor_back_register_entry( Entry *e, - monitor_callback_t *cb ) + monitor_callback_t *cb, + monitor_subsys_t *mss, + unsigned long flags ) { monitor_info_t *mi; @@ -288,7 +434,7 @@ monitor_back_register_entry( assert( e != NULL ); assert( e->e_private == NULL ); - if ( monitor_subsys_opened ) { + if ( monitor_subsys_is_opened() ) { Entry *e_parent = NULL, *e_new = NULL, **ep = NULL; @@ -351,8 +497,14 @@ monitor_back_register_entry( } e_new->e_private = ( void * )mp; - mp->mp_info = mp_parent->mp_info; - mp->mp_flags = mp_parent->mp_flags | MONITOR_F_SUB; + if ( mss != NULL ) { + mp->mp_info = mss; + mp->mp_flags = flags; + + } else { + mp->mp_info = mp_parent->mp_info; + mp->mp_flags = mp_parent->mp_flags | MONITOR_F_SUB; + } mp->mp_cb = cb; ep = &mp_parent->mp_children; @@ -401,8 +553,10 @@ done:; } el.el_cb = cb; + el.el_mss = mss; + el.el_flags = flags; - for ( elpp = (entry_limbo_t **)&mi->mi_entry_limbo; + for ( elpp = &mi->mi_entry_limbo; *elpp; elpp = &(*elpp)->el_next ) /* go to last */; @@ -425,7 +579,9 @@ int monitor_back_register_entry_parent( Entry *e, monitor_callback_t *cb, - struct berval *base, + monitor_subsys_t *mss, + unsigned long flags, + struct berval *nbase, int scope, struct berval *filter ) { @@ -436,7 +592,7 @@ monitor_back_register_entry_parent( Debug( LDAP_DEBUG_ANY, "monitor_back_register_entry_parent(base=\"%s\" scope=%s filter=\"%s\"): " "monitor database not configured.\n", - BER_BVISNULL( base ) ? "" : base->bv_val, + BER_BVISNULL( nbase ) ? "" : nbase->bv_val, ldap_pvt_scope2str( scope ), BER_BVISNULL( filter ) ? "" : filter->bv_val ); return -1; @@ -457,7 +613,7 @@ monitor_back_register_entry_parent( return -1; } - if ( monitor_subsys_opened ) { + if ( monitor_subsys_is_opened() ) { Entry *e_parent = NULL, *e_new = NULL, **ep = NULL; @@ -467,14 +623,15 @@ monitor_back_register_entry_parent( *mp_parent = NULL; int rc = 0; - if ( monitor_filter2ndn( base, scope, filter, &ndn ) ) { + if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) { /* entry does not exist */ Debug( LDAP_DEBUG_ANY, "monitor_back_register_entry_parent(\"\"): " - "base=\"%s\" scope=%d filter=\"%s\": " + "base=\"%s\" scope=%s filter=\"%s\": " "unable to find entry\n", - base->bv_val ? base->bv_val : "\"\"", - scope, filter->bv_val ); + nbase->bv_val ? nbase->bv_val : "\"\"", + ldap_pvt_scope2str( scope ), + filter->bv_val ); return -1; } @@ -511,6 +668,7 @@ monitor_back_register_entry_parent( "entry already exists\n", e_name.bv_val, 0, 0 ); monitor_cache_release( mi, e_new ); + e_new = NULL; rc = -1; goto done; } @@ -540,8 +698,14 @@ monitor_back_register_entry_parent( e_new->e_nname = e_nname; e_new->e_private = ( void * )mp; - mp->mp_info = mp_parent->mp_info; - mp->mp_flags = mp_parent->mp_flags | MONITOR_F_SUB; + if ( mss != NULL ) { + mp->mp_info = mss; + mp->mp_flags = flags; + + } else { + mp->mp_info = mp_parent->mp_info; + mp->mp_flags = mp_parent->mp_flags | MONITOR_F_SUB; + } mp->mp_cb = cb; ep = &mp_parent->mp_children; @@ -580,7 +744,7 @@ done:; } } else { - entry_limbo_t **elpp, el = { 0 }; + entry_limbo_t **elpp = NULL, el = { 0 }; el.el_type = LIMBO_ENTRY_PARENT; @@ -590,43 +754,64 @@ done:; "monitor_back_register_entry(\"%s\"): " "entry_dup() failed\n", e->e_name.bv_val, 0, 0 ); - return -1; + goto done_limbo; } - if ( !BER_BVISNULL( base ) ) { - ber_dupbv( &el.el_base, base ); + if ( !BER_BVISNULL( nbase ) ) { + ber_dupbv( &el.el_nbase, nbase ); } + el.el_scope = scope; if ( !BER_BVISNULL( filter ) ) { - ber_dupbv( &el.el_filter, filter ); + ber_dupbv( &el.el_filter, filter ); } el.el_cb = cb; + el.el_mss = mss; + el.el_flags = flags; - for ( elpp = (entry_limbo_t **)&mi->mi_entry_limbo; + for ( elpp = &mi->mi_entry_limbo; *elpp; elpp = &(*elpp)->el_next ) /* go to last */; *elpp = (entry_limbo_t *)ch_malloc( sizeof( entry_limbo_t ) ); if ( *elpp == NULL ) { - el.el_e->e_private = NULL; + goto done_limbo; + } + +done_limbo:; + if ( *elpp != NULL ) { + el.el_next = NULL; + **elpp = el; + + } else { + if ( !BER_BVISNULL( &el.el_filter ) ) { + ch_free( el.el_filter.bv_val ); + } + if ( !BER_BVISNULL( &el.el_nbase ) ) { + ch_free( el.el_nbase.bv_val ); + } entry_free( el.el_e ); return -1; } - - el.el_next = NULL; - **elpp = el; } return 0; } static int -monitor_filter2ndn_cb( Operation *op, SlapReply *rs ) +monitor_search2ndn_cb( Operation *op, SlapReply *rs ) { if ( rs->sr_type == REP_SEARCH ) { struct berval *ndn = op->o_callback->sc_private; + + if ( !BER_BVISNULL( ndn ) ) { + rs->sr_err = LDAP_SIZELIMIT_EXCEEDED; + ch_free( ndn->bv_val ); + BER_BVZERO( ndn ); + return rs->sr_err; + } ber_dupbv( ndn, &rs->sr_entry->e_nname ); } @@ -635,8 +820,8 @@ monitor_filter2ndn_cb( Operation *op, SlapReply *rs ) } int -monitor_filter2ndn( - struct berval *base, +monitor_search2ndn( + struct berval *nbase, int scope, struct berval *filter, struct berval *ndn ) @@ -644,8 +829,9 @@ monitor_filter2ndn( Connection conn = { 0 }; OperationBuffer opbuf; Operation *op; + void *thrctx; SlapReply rs = { 0 }; - slap_callback cb = { NULL, monitor_filter2ndn_cb, NULL, NULL }; + slap_callback cb = { NULL, monitor_search2ndn_cb, NULL, NULL }; int rc; BER_BVZERO( ndn ); @@ -654,28 +840,27 @@ monitor_filter2ndn( return -1; } - op = (Operation *) &opbuf; - connection_fake_init( &conn, op, &conn ); + thrctx = ldap_pvt_thread_pool_context(); + connection_fake_init( &conn, &opbuf, thrctx ); + op = &opbuf.ob_op; op->o_tag = LDAP_REQ_SEARCH; /* use global malloc for now */ if ( op->o_tmpmemctx ) { - /* FIXME: connection_fake_init() calls slap_sl_mem_create, so we destroy it for now */ - slap_sl_mem_destroy( NULL, op->o_tmpmemctx ); op->o_tmpmemctx = NULL; } op->o_tmpmfuncs = &ch_mfuncs; op->o_bd = be_monitor; - if ( base == NULL || BER_BVISNULL( base ) ) { + if ( nbase == NULL || BER_BVISNULL( nbase ) ) { ber_dupbv_x( &op->o_req_dn, &op->o_bd->be_suffix[ 0 ], op->o_tmpmemctx ); ber_dupbv_x( &op->o_req_ndn, &op->o_bd->be_nsuffix[ 0 ], op->o_tmpmemctx ); } else { - if ( dnPrettyNormal( NULL, base, &op->o_req_dn, &op->o_req_ndn, + if ( dnPrettyNormal( NULL, nbase, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx ) ) { return -1; } @@ -685,8 +870,12 @@ monitor_filter2ndn( cb.sc_private = (void *)ndn; op->ors_scope = scope; - ber_dupbv_x( &op->ors_filterstr, filter, op->o_tmpmemctx ); op->ors_filter = str2filter_x( op, filter->bv_val ); + if ( op->ors_filter == NULL ) { + rc = LDAP_OTHER; + goto cleanup; + } + ber_dupbv_x( &op->ors_filterstr, filter, op->o_tmpmemctx ); op->ors_attrs = slap_anlist_no_attrs; op->ors_attrsonly = 0; op->ors_tlimit = SLAP_NO_LIMIT; @@ -702,10 +891,19 @@ monitor_filter2ndn( rc = op->o_bd->be_search( op, &rs ); - filter_free_x( op, op->ors_filter ); - op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx ); - op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx ); - op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx ); +cleanup:; + if ( op->ors_filter != NULL ) { + filter_free_x( op, op->ors_filter, 1 ); + } + if ( !BER_BVISNULL( &op->ors_filterstr ) ) { + op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx ); + } + if ( !BER_BVISNULL( &op->o_req_dn ) ) { + op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx ); + } + if ( !BER_BVISNULL( &op->o_req_ndn ) ) { + op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx ); + } if ( rc != 0 ) { return rc; @@ -736,7 +934,7 @@ monitor_back_register_entry_attrs( struct berval *ndn_in, Attribute *a, monitor_callback_t *cb, - struct berval *base, + struct berval *nbase, int scope, struct berval *filter ) { @@ -751,7 +949,7 @@ monitor_back_register_entry_attrs( "monitor_back_register_entry_%s(base=\"%s\" scope=%s filter=\"%s\"): " "monitor database not configured.\n", fname, - BER_BVISNULL( base ) ? "" : base->bv_val, + BER_BVISNULL( nbase ) ? "" : nbase->bv_val, ldap_pvt_scope2str( scope ), BER_BVISNULL( filter ) ? "" : filter->bv_val ); Debug( LDAP_DEBUG_ANY, "%s\n", buf, 0, 0 ); @@ -783,7 +981,7 @@ monitor_back_register_entry_attrs( return -1; } - if ( monitor_subsys_opened ) { + if ( monitor_subsys_is_opened() ) { Entry *e = NULL; Attribute **atp = NULL; monitor_entry_t *mp = NULL; @@ -792,16 +990,17 @@ monitor_back_register_entry_attrs( int freeit = 0; if ( BER_BVISNULL( &ndn ) ) { - if ( monitor_filter2ndn( base, scope, filter, &ndn ) ) { + if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) { char buf[ SLAP_TEXT_BUFLEN ]; snprintf( buf, sizeof( buf ), "monitor_back_register_entry_%s(\"\"): " - "base=\"%s\" scope=%d filter=\"%s\": " + "base=\"%s\" scope=%s filter=\"%s\": " "unable to find entry\n", fname, - base->bv_val ? base->bv_val : "\"\"", - scope, filter->bv_val ); + nbase->bv_val ? nbase->bv_val : "\"\"", + ldap_pvt_scope2str( scope ), + filter->bv_val ); /* entry does not exist */ Debug( LDAP_DEBUG_ANY, "%s\n", buf, 0, 0 ); @@ -890,21 +1089,19 @@ done:; entry_limbo_t **elpp, el = { 0 }; el.el_type = LIMBO_ATTRS; - if ( !BER_BVISNULL( &ndn ) ) { - ber_dupbv( &el.el_ndn, &ndn ); - } - if ( !BER_BVISNULL( base ) ) { - ber_dupbv( &el.el_base, base); + el.el_ndn = ndn_in; + if ( !BER_BVISNULL( nbase ) ) { + ber_dupbv( &el.el_nbase, nbase); } el.el_scope = scope; if ( !BER_BVISNULL( filter ) ) { - ber_dupbv( &el.el_filter, filter ); + ber_dupbv( &el.el_filter, filter ); } el.el_a = attrs_dup( a ); el.el_cb = cb; - for ( elpp = (entry_limbo_t **)&mi->mi_entry_limbo; + for ( elpp = &mi->mi_entry_limbo; *elpp; elpp = &(*elpp)->el_next ) /* go to last */; @@ -916,8 +1113,22 @@ done:; return -1; } - el.el_next = NULL; - **elpp = el; + if ( *elpp != NULL ) { + el.el_next = NULL; + **elpp = el; + + } else { + if ( !BER_BVISNULL( &el.el_filter ) ) { + ch_free( el.el_filter.bv_val ); + } + if ( el.el_a != NULL ) { + attrs_free( el.el_a ); + } + if ( !BER_BVISNULL( &el.el_nbase ) ) { + ch_free( &el.el_nbase.bv_val ); + } + return -1; + } } return 0; @@ -927,12 +1138,12 @@ int monitor_back_register_entry_callback( struct berval *ndn, monitor_callback_t *cb, - struct berval *base, + struct berval *nbase, int scope, struct berval *filter ) { return monitor_back_register_entry_attrs( ndn, NULL, cb, - base, scope, filter ); + nbase, scope, filter ); } /* @@ -942,7 +1153,7 @@ monitor_back_register_entry_callback( */ int monitor_back_unregister_entry( - Entry *target_e ) + struct berval *ndn ) { monitor_info_t *mi; @@ -950,26 +1161,32 @@ monitor_back_unregister_entry( Debug( LDAP_DEBUG_ANY, "monitor_back_unregister_entry(\"%s\"): " "monitor database not configured.\n", - target_e->e_name.bv_val, 0, 0 ); + ndn->bv_val, 0, 0 ); return -1; } + /* entry will be regularly freed, and resources released + * according to callbacks */ + if ( slapd_shutdown ) { + return 0; + } + mi = ( monitor_info_t * )be_monitor->be_private; assert( mi != NULL ); - if ( monitor_subsys_opened ) { + if ( monitor_subsys_is_opened() ) { Entry *e = NULL; monitor_entry_t *mp = NULL; monitor_callback_t *cb = NULL; - if ( monitor_cache_remove( mi, &target_e->e_nname, &e ) != 0 ) { + if ( monitor_cache_remove( mi, ndn, &e ) != 0 ) { /* entry does not exist */ Debug( LDAP_DEBUG_ANY, "monitor_back_unregister_entry(\"%s\"): " "entry removal failed.\n", - target_e->e_name.bv_val, 0, 0 ); + ndn->bv_val, 0, 0 ); return -1; } @@ -980,16 +1197,196 @@ monitor_back_unregister_entry( monitor_callback_t *next = cb->mc_next; if ( cb->mc_free ) { - (void)cb->mc_free( e, cb->mc_private ); + (void)cb->mc_free( e, &cb->mc_private ); } ch_free( cb ); cb = next; } + ch_free( mp ); + e->e_private = NULL; + entry_free( e ); + } else { - /* TODO: remove from limbo */ - return 1; + entry_limbo_t **elpp; + + for ( elpp = &mi->mi_entry_limbo; + *elpp; + elpp = &(*elpp)->el_next ) + { + entry_limbo_t *elp = *elpp; + + if ( elp->el_type == LIMBO_ENTRY + && dn_match( ndn, &elp->el_e->e_nname ) ) + { + monitor_callback_t *cb, *next; + + for ( cb = elp->el_cb; cb; cb = next ) { + /* FIXME: call callbacks? */ + next = cb->mc_next; + if ( cb->mc_dispose ) { + cb->mc_dispose( &cb->mc_private ); + } + ch_free( cb ); + } + assert( elp->el_e != NULL ); + elp->el_e->e_private = NULL; + entry_free( elp->el_e ); + *elpp = elp->el_next; + ch_free( elp ); + elpp = NULL; + break; + } + } + + if ( elpp != NULL ) { + /* not found! where did it go? */ + return 1; + } + } + + return 0; +} + +int +monitor_back_unregister_entry_parent( + struct berval *nrdn, + monitor_callback_t *target_cb, + struct berval *nbase, + int scope, + struct berval *filter ) +{ + monitor_info_t *mi; + struct berval ndn = BER_BVNULL; + + if ( be_monitor == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_back_unregister_entry_parent(base=\"%s\" scope=%s filter=\"%s\"): " + "monitor database not configured.\n", + BER_BVISNULL( nbase ) ? "" : nbase->bv_val, + ldap_pvt_scope2str( scope ), + BER_BVISNULL( filter ) ? "" : filter->bv_val ); + + return -1; + } + + /* entry will be regularly freed, and resources released + * according to callbacks */ + if ( slapd_shutdown ) { + return 0; + } + + mi = ( monitor_info_t * )be_monitor->be_private; + + assert( mi != NULL ); + + if ( ( nrdn == NULL || BER_BVISNULL( nrdn ) ) + && BER_BVISNULL( filter ) ) + { + /* need a filter */ + Debug( LDAP_DEBUG_ANY, + "monitor_back_unregister_entry_parent(\"\"): " + "need a valid filter\n", + 0, 0, 0 ); + return -1; + } + + if ( monitor_subsys_is_opened() ) { + Entry *e = NULL; + monitor_entry_t *mp = NULL; + + if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) { + /* entry does not exist */ + Debug( LDAP_DEBUG_ANY, + "monitor_back_unregister_entry_parent(\"\"): " + "base=\"%s\" scope=%s filter=\"%s\": " + "unable to find entry\n", + nbase->bv_val ? nbase->bv_val : "\"\"", + ldap_pvt_scope2str( scope ), + filter->bv_val ); + return -1; + } + + if ( monitor_cache_remove( mi, &ndn, &e ) != 0 ) { + /* entry does not exist */ + Debug( LDAP_DEBUG_ANY, + "monitor_back_unregister_entry(\"%s\"): " + "entry removal failed.\n", + ndn.bv_val, 0, 0 ); + ber_memfree( ndn.bv_val ); + return -1; + } + ber_memfree( ndn.bv_val ); + + mp = (monitor_entry_t *)e->e_private; + assert( mp != NULL ); + + if ( target_cb != NULL ) { + monitor_callback_t **cbp; + + for ( cbp = &mp->mp_cb; *cbp != NULL; cbp = &(*cbp)->mc_next ) { + if ( *cbp == target_cb ) { + if ( (*cbp)->mc_free ) { + (void)(*cbp)->mc_free( e, &(*cbp)->mc_private ); + } + *cbp = (*cbp)->mc_next; + ch_free( target_cb ); + break; + } + } + } + + + ch_free( mp ); + e->e_private = NULL; + entry_free( e ); + + } else { + entry_limbo_t **elpp; + + for ( elpp = &mi->mi_entry_limbo; + *elpp; + elpp = &(*elpp)->el_next ) + { + entry_limbo_t *elp = *elpp; + + if ( elp->el_type == LIMBO_ENTRY_PARENT + && dn_match( nrdn, &elp->el_e->e_nname ) + && dn_match( nbase, &elp->el_nbase ) + && scope == elp->el_scope + && bvmatch( filter, &elp->el_filter ) ) + { + monitor_callback_t *cb, *next; + + for ( cb = elp->el_cb; cb; cb = next ) { + /* FIXME: call callbacks? */ + next = cb->mc_next; + if ( cb->mc_dispose ) { + cb->mc_dispose( &cb->mc_private ); + } + ch_free( cb ); + } + assert( elp->el_e != NULL ); + elp->el_e->e_private = NULL; + entry_free( elp->el_e ); + if ( !BER_BVISNULL( &elp->el_nbase ) ) { + ch_free( elp->el_nbase.bv_val ); + } + if ( !BER_BVISNULL( &elp->el_filter ) ) { + ch_free( elp->el_filter.bv_val ); + } + *elpp = elp->el_next; + ch_free( elp ); + elpp = NULL; + break; + } + } + + if ( elpp != NULL ) { + /* not found! where did it go? */ + return 1; + } } return 0; @@ -1000,7 +1397,7 @@ monitor_back_unregister_entry_attrs( struct berval *ndn_in, Attribute *target_a, monitor_callback_t *target_cb, - struct berval *base, + struct berval *nbase, int scope, struct berval *filter ) { @@ -1015,14 +1412,20 @@ monitor_back_unregister_entry_attrs( "monitor_back_unregister_entry_%s(base=\"%s\" scope=%s filter=\"%s\"): " "monitor database not configured.\n", fname, - BER_BVISNULL( base ) ? "" : base->bv_val, - (char *)ldap_pvt_scope2str( scope ), + BER_BVISNULL( nbase ) ? "" : nbase->bv_val, + ldap_pvt_scope2str( scope ), BER_BVISNULL( filter ) ? "" : filter->bv_val ); Debug( LDAP_DEBUG_ANY, "%s\n", buf, 0, 0 ); return -1; } + /* entry will be regularly freed, and resources released + * according to callbacks */ + if ( slapd_shutdown ) { + return 0; + } + mi = ( monitor_info_t * )be_monitor->be_private; assert( mi != NULL ); @@ -1047,13 +1450,13 @@ monitor_back_unregister_entry_attrs( return -1; } - if ( monitor_subsys_opened ) { + if ( monitor_subsys_is_opened() ) { Entry *e = NULL; monitor_entry_t *mp = NULL; int freeit = 0; if ( BER_BVISNULL( &ndn ) ) { - if ( monitor_filter2ndn( base, scope, filter, &ndn ) ) { + if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) { char buf[ SLAP_TEXT_BUFLEN ]; snprintf( buf, sizeof( buf ), @@ -1061,7 +1464,7 @@ monitor_back_unregister_entry_attrs( "base=\"%s\" scope=%d filter=\"%s\": " "unable to find entry\n", fname, - base->bv_val ? base->bv_val : "\"\"", + nbase->bv_val ? nbase->bv_val : "\"\"", scope, filter->bv_val ); /* entry does not exist */ @@ -1090,7 +1493,7 @@ monitor_back_unregister_entry_attrs( for ( cbp = &mp->mp_cb; *cbp != NULL; cbp = &(*cbp)->mc_next ) { if ( *cbp == target_cb ) { if ( (*cbp)->mc_free ) { - (void)(*cbp)->mc_free( e, (*cbp)->mc_private ); + (void)(*cbp)->mc_free( e, &(*cbp)->mc_private ); } *cbp = (*cbp)->mc_next; ch_free( target_cb ); @@ -1121,13 +1524,53 @@ monitor_back_unregister_entry_attrs( ber_memfree( ndn.bv_val ); } - if ( e ) { - monitor_cache_release( mi, e ); - } + monitor_cache_release( mi, e ); } else { - /* TODO: remove from limbo */ - return 1; + entry_limbo_t **elpp; + + for ( elpp = &mi->mi_entry_limbo; + *elpp; + elpp = &(*elpp)->el_next ) + { + entry_limbo_t *elp = *elpp; + + if ( elp->el_type == LIMBO_ATTRS + && dn_match( nbase, &elp->el_nbase ) + && scope == elp->el_scope + && bvmatch( filter, &elp->el_filter ) ) + { + monitor_callback_t *cb, *next; + + for ( cb = elp->el_cb; cb; cb = next ) { + /* FIXME: call callbacks? */ + next = cb->mc_next; + if ( cb->mc_dispose ) { + cb->mc_dispose( &cb->mc_private ); + } + ch_free( cb ); + } + assert( elp->el_e == NULL ); + if ( elp->el_a != NULL ) { + attrs_free( elp->el_a ); + } + if ( !BER_BVISNULL( &elp->el_nbase ) ) { + ch_free( elp->el_nbase.bv_val ); + } + if ( !BER_BVISNULL( &elp->el_filter ) ) { + ch_free( elp->el_filter.bv_val ); + } + *elpp = elp->el_next; + ch_free( elp ); + elpp = NULL; + break; + } + } + + if ( elpp != NULL ) { + /* not found! where did it go? */ + return 1; + } } return 0; @@ -1137,7 +1580,7 @@ int monitor_back_unregister_entry_callback( struct berval *ndn, monitor_callback_t *cb, - struct berval *base, + struct berval *nbase, int scope, struct berval *filter ) { @@ -1145,7 +1588,7 @@ monitor_back_unregister_entry_callback( * unregister the callback; if a is not null, unregister the * given attrs. In any case, call cb->cb_free */ return monitor_back_unregister_entry_attrs( ndn, - NULL, cb, base, scope, filter ); + NULL, cb, nbase, scope, filter ); } monitor_subsys_t * @@ -1216,12 +1659,11 @@ monitor_back_initialize( }; struct m_s { - char *name; char *schema; slap_mask_t flags; int offset; } moc[] = { - { "monitor", "( 1.3.6.1.4.1.4203.666.3.16.1 " + { "( 1.3.6.1.4.1.4203.666.3.16.1 " "NAME 'monitor' " "DESC 'OpenLDAP system monitoring' " "SUP top STRUCTURAL " @@ -1235,44 +1677,44 @@ monitor_back_initialize( "$ monitorOverlay " ") )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_monitor) }, - { "monitorServer", "( 1.3.6.1.4.1.4203.666.3.16.2 " + { "( 1.3.6.1.4.1.4203.666.3.16.2 " "NAME 'monitorServer' " "DESC 'Server monitoring root entry' " "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_monitorServer) }, - { "monitorContainer", "( 1.3.6.1.4.1.4203.666.3.16.3 " + { "( 1.3.6.1.4.1.4203.666.3.16.3 " "NAME 'monitorContainer' " "DESC 'monitor container class' " "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_monitorContainer) }, - { "monitorCounterObject", "( 1.3.6.1.4.1.4203.666.3.16.4 " + { "( 1.3.6.1.4.1.4203.666.3.16.4 " "NAME 'monitorCounterObject' " "DESC 'monitor counter class' " "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_monitorCounterObject) }, - { "monitorOperation", "( 1.3.6.1.4.1.4203.666.3.16.5 " + { "( 1.3.6.1.4.1.4203.666.3.16.5 " "NAME 'monitorOperation' " "DESC 'monitor operation class' " "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_monitorOperation) }, - { "monitorConnection", "( 1.3.6.1.4.1.4203.666.3.16.6 " + { "( 1.3.6.1.4.1.4203.666.3.16.6 " "NAME 'monitorConnection' " "DESC 'monitor connection class' " "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_monitorConnection) }, - { "managedObject", "( 1.3.6.1.4.1.4203.666.3.16.7 " + { "( 1.3.6.1.4.1.4203.666.3.16.7 " "NAME 'managedObject' " "DESC 'monitor managed entity class' " "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_managedObject) }, - { "monitoredObject", "( 1.3.6.1.4.1.4203.666.3.16.8 " + { "( 1.3.6.1.4.1.4203.666.3.16.8 " "NAME 'monitoredObject' " "DESC 'monitor monitored entity class' " "SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE, offsetof(monitor_info_t, mi_oc_monitoredObject) }, - { NULL, NULL, 0, -1 } + { NULL, 0, -1 } }, mat[] = { - { "monitoredInfo", "( 1.3.6.1.4.1.4203.666.1.55.1 " + { "( 1.3.6.1.4.1.4203.666.1.55.1 " "NAME 'monitoredInfo' " "DESC 'monitored info' " /* "SUP name " */ @@ -1280,67 +1722,67 @@ monitor_back_initialize( "SUBSTR caseIgnoreSubstringsMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitoredInfo) }, - { "managedInfo", "( 1.3.6.1.4.1.4203.666.1.55.2 " + { "( 1.3.6.1.4.1.4203.666.1.55.2 " "NAME 'managedInfo' " "DESC 'monitor managed info' " "SUP name )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_managedInfo) }, - { "monitorCounter", "( 1.3.6.1.4.1.4203.666.1.55.3 " + { "( 1.3.6.1.4.1.4203.666.1.55.3 " "NAME 'monitorCounter' " "DESC 'monitor counter' " "EQUALITY integerMatch " "ORDERING integerOrderingMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorCounter) }, - { "monitorOpCompleted", "( 1.3.6.1.4.1.4203.666.1.55.4 " + { "( 1.3.6.1.4.1.4203.666.1.55.4 " "NAME 'monitorOpCompleted' " "DESC 'monitor completed operations' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorOpCompleted) }, - { "monitorOpInitiated", "( 1.3.6.1.4.1.4203.666.1.55.5 " + { "( 1.3.6.1.4.1.4203.666.1.55.5 " "NAME 'monitorOpInitiated' " "DESC 'monitor initiated operations' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorOpInitiated) }, - { "monitorConnectionNumber", "( 1.3.6.1.4.1.4203.666.1.55.6 " + { "( 1.3.6.1.4.1.4203.666.1.55.6 " "NAME 'monitorConnectionNumber' " "DESC 'monitor connection number' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionNumber) }, - { "monitorConnectionAuthzDN", "( 1.3.6.1.4.1.4203.666.1.55.7 " + { "( 1.3.6.1.4.1.4203.666.1.55.7 " "NAME 'monitorConnectionAuthzDN' " "DESC 'monitor connection authorization DN' " /* "SUP distinguishedName " */ "EQUALITY distinguishedNameMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionAuthzDN) }, - { "monitorConnectionLocalAddress", "( 1.3.6.1.4.1.4203.666.1.55.8 " + { "( 1.3.6.1.4.1.4203.666.1.55.8 " "NAME 'monitorConnectionLocalAddress' " "DESC 'monitor connection local address' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionLocalAddress) }, - { "monitorConnectionPeerAddress", "( 1.3.6.1.4.1.4203.666.1.55.9 " + { "( 1.3.6.1.4.1.4203.666.1.55.9 " "NAME 'monitorConnectionPeerAddress' " "DESC 'monitor connection peer address' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionPeerAddress) }, - { "monitorTimestamp", "( 1.3.6.1.4.1.4203.666.1.55.10 " + { "( 1.3.6.1.4.1.4203.666.1.55.10 " "NAME 'monitorTimestamp' " "DESC 'monitor timestamp' " "EQUALITY generalizedTimeMatch " @@ -1348,241 +1790,237 @@ monitor_back_initialize( "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 " "SINGLE-VALUE " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorTimestamp) }, - { "monitorOverlay", "( 1.3.6.1.4.1.4203.666.1.55.11 " + { "( 1.3.6.1.4.1.4203.666.1.55.11 " "NAME 'monitorOverlay' " "DESC 'name of overlays defined for a given database' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorOverlay) }, - { "readOnly", "( 1.3.6.1.4.1.4203.666.1.55.12 " + { "( 1.3.6.1.4.1.4203.666.1.55.12 " "NAME 'readOnly' " "DESC 'read/write status of a given database' " "EQUALITY booleanMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_readOnly) }, - { "restrictedOperation", "( 1.3.6.1.4.1.4203.666.1.55.13 " + { "( 1.3.6.1.4.1.4203.666.1.55.13 " "NAME 'restrictedOperation' " "DESC 'name of restricted operation for a given database' " "SUP managedInfo )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_restrictedOperation ) }, - { "monitorConnectionProtocol", "( 1.3.6.1.4.1.4203.666.1.55.14 " + { "( 1.3.6.1.4.1.4203.666.1.55.14 " "NAME 'monitorConnectionProtocol' " "DESC 'monitor connection protocol' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionProtocol) }, - { "monitorConnectionOpsReceived", "( 1.3.6.1.4.1.4203.666.1.55.15 " + { "( 1.3.6.1.4.1.4203.666.1.55.15 " "NAME 'monitorConnectionOpsReceived' " "DESC 'monitor number of operations received by the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsReceived) }, - { "monitorConnectionOpsExecuting", "( 1.3.6.1.4.1.4203.666.1.55.16 " + { "( 1.3.6.1.4.1.4203.666.1.55.16 " "NAME 'monitorConnectionOpsExecuting' " "DESC 'monitor number of operations in execution within the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsExecuting) }, - { "monitorConnectionOpsPending", "( 1.3.6.1.4.1.4203.666.1.55.17 " + { "( 1.3.6.1.4.1.4203.666.1.55.17 " "NAME 'monitorConnectionOpsPending' " "DESC 'monitor number of pending operations within the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsPending) }, - { "monitorConnectionOpsCompleted", "( 1.3.6.1.4.1.4203.666.1.55.18 " + { "( 1.3.6.1.4.1.4203.666.1.55.18 " "NAME 'monitorConnectionOpsCompleted' " "DESC 'monitor number of operations completed within the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsCompleted) }, - { "monitorConnectionGet", "( 1.3.6.1.4.1.4203.666.1.55.19 " + { "( 1.3.6.1.4.1.4203.666.1.55.19 " "NAME 'monitorConnectionGet' " "DESC 'number of times connection_get() was called so far' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionGet) }, - { "monitorConnectionRead", "( 1.3.6.1.4.1.4203.666.1.55.20 " + { "( 1.3.6.1.4.1.4203.666.1.55.20 " "NAME 'monitorConnectionRead' " "DESC 'number of times connection_read() was called so far' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionRead) }, - { "monitorConnectionWrite", "( 1.3.6.1.4.1.4203.666.1.55.21 " + { "( 1.3.6.1.4.1.4203.666.1.55.21 " "NAME 'monitorConnectionWrite' " "DESC 'number of times connection_write() was called so far' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionWrite) }, - { "monitorConnectionMask", "( 1.3.6.1.4.1.4203.666.1.55.22 " + { "( 1.3.6.1.4.1.4203.666.1.55.22 " "NAME 'monitorConnectionMask' " "DESC 'monitor connection mask' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionMask) }, - { "monitorConnectionListener", "( 1.3.6.1.4.1.4203.666.1.55.23 " + { "( 1.3.6.1.4.1.4203.666.1.55.23 " "NAME 'monitorConnectionListener' " "DESC 'monitor connection listener' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionListener) }, - { "monitorConnectionPeerDomain", "( 1.3.6.1.4.1.4203.666.1.55.24 " + { "( 1.3.6.1.4.1.4203.666.1.55.24 " "NAME 'monitorConnectionPeerDomain' " "DESC 'monitor connection peer domain' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionPeerDomain) }, - { "monitorConnectionStartTime", "( 1.3.6.1.4.1.4203.666.1.55.25 " + { "( 1.3.6.1.4.1.4203.666.1.55.25 " "NAME 'monitorConnectionStartTime' " "DESC 'monitor connection start time' " "SUP monitorTimestamp " "SINGLE-VALUE " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionStartTime) }, - { "monitorConnectionActivityTime", "( 1.3.6.1.4.1.4203.666.1.55.26 " + { "( 1.3.6.1.4.1.4203.666.1.55.26 " "NAME 'monitorConnectionActivityTime' " "DESC 'monitor connection activity time' " "SUP monitorTimestamp " "SINGLE-VALUE " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionActivityTime) }, - { "monitorIsShadow", "( 1.3.6.1.4.1.4203.666.1.55.27 " + { "( 1.3.6.1.4.1.4203.666.1.55.27 " "NAME 'monitorIsShadow' " "DESC 'TRUE if the database is shadow' " "EQUALITY booleanMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorIsShadow) }, - { "monitorUpdateRef", "( 1.3.6.1.4.1.4203.666.1.55.28 " + { "( 1.3.6.1.4.1.4203.666.1.55.28 " "NAME 'monitorUpdateRef' " "DESC 'update referral for shadow databases' " "SUP monitoredInfo " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorUpdateRef) }, - { "monitorRuntimeConfig", "( 1.3.6.1.4.1.4203.666.1.55.29 " + { "( 1.3.6.1.4.1.4203.666.1.55.29 " "NAME 'monitorRuntimeConfig' " "DESC 'TRUE if component allows runtime configuration' " "EQUALITY booleanMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorRuntimeConfig) }, - { NULL, NULL, 0, -1 } + { "( 1.3.6.1.4.1.4203.666.1.55.30 " + "NAME 'monitorSuperiorDN' " + "DESC 'monitor superior DN' " + /* "SUP distinguishedName " */ + "EQUALITY distinguishedNameMatch " + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 " + "NO-USER-MODIFICATION " + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + offsetof(monitor_info_t, mi_ad_monitorSuperiorDN) }, + { NULL, 0, -1 } + }; + + static struct { + char *name; + char *oid; + } s_oid[] = { + { "olmAttributes", "1.3.6.1.4.1.4203.666.1.55" }, + { "olmSubSystemAttributes", "olmAttributes:0" }, + { "olmGenericAttributes", "olmSubSystemAttributes:0" }, + { "olmDatabaseAttributes", "olmSubSystemAttributes:1" }, + + /* for example, back-bdb specific attrs + * are in "olmDatabaseAttributes:1" + * + * NOTE: developers, please record here OID assignments + * for other modules */ + + { "olmObjectClasses", "1.3.6.1.4.1.4203.666.3.16" }, + { "olmSubSystemObjectClasses", "olmObjectClasses:0" }, + { "olmGenericObjectClasses", "olmSubSystemObjectClasses:0" }, + { "olmDatabaseObjectClasses", "olmSubSystemObjectClasses:1" }, + + /* for example, back-bdb specific objectClasses + * are in "olmDatabaseObjectClasses:1" + * + * NOTE: developers, please record here OID assignments + * for other modules */ + + { NULL } }; int i, rc; - const char *text; monitor_info_t *mi = &monitor_info; + ConfigArgs c; + char *argv[ 3 ]; - /* schema integration */ - for ( i = 0; mat[ i ].name; i++ ) { - LDAPAttributeType *at; - int code; - const char *err; - AttributeDescription **ad; - - at = ldap_str2attributetype( mat[ i ].schema, &code, - &err, LDAP_SCHEMA_ALLOW_ALL ); - if ( !at ) { - Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: " - "in AttributeType \"%s\" %s before %s\n", - mat[ i ].name, ldap_scherr2str(code), err ); - return -1; - } + argv[ 0 ] = "monitor"; + c.argv = argv; + c.argc = 3; + c.fname = argv[0]; - if ( at->at_oid == NULL ) { - ldap_attributetype_free(at); - Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: " - "null OID for attributeType \"%s\"\n", - mat[ i ].name, 0, 0 ); - return -1; - } + for ( i = 0; s_oid[ i ].name; i++ ) { + argv[ 1 ] = s_oid[ i ].name; + argv[ 2 ] = s_oid[ i ].oid; - code = at_add(at, 0, NULL, &err); - if ( code ) { - ldap_attributetype_free(at); - Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: " - "%s in attributeType \"%s\"\n", - scherr2str(code), mat[ i ].name, 0 ); - return -1; - } - ldap_memfree(at); - - ad = ((AttributeDescription **)&(((char *)mi)[ mat[ i ].offset ])); - ad[ 0 ] = NULL; - if ( slap_str2ad( mat[ i ].name, ad, &text ) ) { + if ( parse_oidm( &c, 0, NULL ) != 0 ) { Debug( LDAP_DEBUG_ANY, - "monitor_back_db_init: %s\n", text, 0, 0 ); - return -1; + "monitor_back_initialize: unable to add " + "objectIdentifier \"%s=%s\"\n", + s_oid[ i ].name, s_oid[ i ].oid, 0 ); + return 1; } - - (*ad)->ad_type->sat_flags |= mat[ i ].flags; } - for ( i = 0; moc[ i ].name; i++ ) { - LDAPObjectClass *oc; + /* schema integration */ + for ( i = 0; mat[ i ].schema; i++ ) { int code; - const char *err; - ObjectClass *Oc; + AttributeDescription **ad = + ((AttributeDescription **)&(((char *)mi)[ mat[ i ].offset ])); - oc = ldap_str2objectclass(moc[ i ].schema, &code, &err, - LDAP_SCHEMA_ALLOW_ALL ); - if ( !oc ) { - Debug( LDAP_DEBUG_ANY, - "unable to parse monitor objectclass \"%s\": " - "%s before %s\n" , moc[ i ].name, - ldap_scherr2str(code), err ); - return -1; - } + *ad = NULL; + code = register_at( mat[ i ].schema, ad, 0 ); - if ( oc->oc_oid == NULL ) { - ldap_objectclass_free(oc); + if ( code ) { Debug( LDAP_DEBUG_ANY, - "objectclass \"%s\" has no OID\n" , - moc[ i ].name, 0, 0 ); + "monitor_back_db_init: register_at failed\n", 0, 0, 0 ); return -1; } + (*ad)->ad_type->sat_flags |= mat[ i ].flags; + } + + for ( i = 0; moc[ i ].schema; i++ ) { + int code; + ObjectClass **Oc = + ((ObjectClass **)&(((char *)mi)[ moc[ i ].offset ])); - code = oc_add(oc, 0, NULL, &err); + code = register_oc( moc[ i ].schema, Oc, 0 ); if ( code ) { - ldap_objectclass_free(oc); Debug( LDAP_DEBUG_ANY, - "objectclass \"%s\": %s \"%s\"\n" , - moc[ i ].name, scherr2str(code), err ); + "monitor_back_db_init: register_oc failed\n", 0, 0, 0 ); return -1; } - ldap_memfree(oc); - - Oc = oc_find( moc[ i ].name ); - if ( Oc == NULL ) { - Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: " - "unable to find objectClass %s " - "(just added)\n", moc[ i ].name, 0, 0 ); - return -1; - } - - Oc->soc_flags |= moc[ i ].flags; - - ((ObjectClass **)&(((char *)mi)[ moc[ i ].offset ]))[ 0 ] = Oc; + (*Oc)->soc_flags |= moc[ i ].flags; } bi->bi_controls = controls; @@ -1629,12 +2067,13 @@ monitor_back_initialize( bi->bi_tool_entry_reindex = 0; bi->bi_tool_sync = 0; bi->bi_tool_dn2id_get = 0; - bi->bi_tool_id2entry_get = 0; bi->bi_tool_entry_modify = 0; bi->bi_connection_init = 0; bi->bi_connection_destroy = 0; + bi->bi_extra = (void *)&monitor_extra; + /* * configuration objectClasses (fake) */ @@ -1650,7 +2089,8 @@ monitor_back_initialize( int monitor_back_db_init( - BackendDB *be ) + BackendDB *be, + ConfigReply *c) { int rc; struct berval dn = BER_BVC( SLAPD_MONITOR_DN ), @@ -1661,23 +2101,24 @@ monitor_back_db_init( monitor_subsys_t *ms; /* - * register subsys + * database monitor can be defined once only */ - for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) { - if ( monitor_back_register_subsys( ms ) ) { - return -1; + if ( be_monitor != NULL ) { + if (c) { + snprintf(c->msg, sizeof(c->msg),"only one monitor database allowed"); } + return( -1 ); } + be_monitor = be; /* - * database monitor can be defined once only + * register subsys */ - if ( be_monitor != NULL ) { - Debug( LDAP_DEBUG_ANY, - "only one monitor database is allowed\n", 0, 0, 0 ); - return( -1 ); + for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) { + if ( monitor_back_register_subsys( ms ) ) { + return -1; + } } - be_monitor = be; /* indicate system schema supported */ SLAP_BFLAGS(be) |= SLAP_BFLAG_MONITOR; @@ -1699,7 +2140,7 @@ monitor_back_db_init( be->be_private = &monitor_info; - be2 = select_backend( &ndn, 0, 0 ); + be2 = select_backend( &ndn, 0 ); if ( be2 != be ) { char *type = be2->bd_info->bi_type; @@ -1708,19 +2149,57 @@ monitor_back_db_init( type = oi->oi_orig->bi_type; } - Debug( LDAP_DEBUG_ANY, - "\"monitor\" database serving namingContext \"%s\" " - "is hidden by \"%s\" database serving namingContext \"%s\".\n", - pdn.bv_val, type, be2->be_nsuffix[ 0 ].bv_val ); + if (c) { + snprintf(c->msg, sizeof(c->msg), + "\"monitor\" database serving namingContext \"%s\" " + "is hidden by \"%s\" database serving namingContext \"%s\".\n", + pdn.bv_val, type, be2->be_nsuffix[ 0 ].bv_val ); + } return -1; } return 0; } +static void +monitor_back_destroy_limbo_entry( + entry_limbo_t *el, + int dispose ) +{ + if ( el->el_e ) { + entry_free( el->el_e ); + } + if ( el->el_a ) { + attrs_free( el->el_a ); + } + if ( !BER_BVISNULL( &el->el_nbase ) ) { + ber_memfree( el->el_nbase.bv_val ); + } + if ( !BER_BVISNULL( &el->el_filter ) ) { + ber_memfree( el->el_filter.bv_val ); + } + + /* NOTE: callbacks are not copied; so only free them + * if disposing of */ + if ( el->el_cb && dispose != 0 ) { + monitor_callback_t *next; + + for ( ; el->el_cb; el->el_cb = next ) { + next = el->el_cb->mc_next; + if ( el->el_cb->mc_dispose ) { + el->el_cb->mc_dispose( &el->el_cb->mc_private ); + } + ch_free( el->el_cb ); + } + } + + ch_free( el ); +} + int monitor_back_db_open( - BackendDB *be ) + BackendDB *be, + ConfigReply *cr) { monitor_info_t *mi = (monitor_info_t *)be->be_private; struct monitor_subsys_t **ms; @@ -1740,6 +2219,8 @@ monitor_back_db_open( " attributes, which must be explicitly requested."), BER_BVNULL }; + int retcode = 0; + assert( be_monitor != NULL ); if ( be != be_monitor ) { be_monitor = be; @@ -1909,8 +2390,7 @@ monitor_back_db_open( * opens the monitor backend subsystems */ for ( ms = monitor_subsys; ms[ 0 ] != NULL; ms++ ) { - if ( ms[ 0 ]->mss_open && ( *ms[ 0 ]->mss_open )( be, ms[ 0 ] ) ) - { + if ( ms[ 0 ]->mss_open && ms[ 0 ]->mss_open( be, ms[ 0 ] ) ) { return( -1 ); } ms[ 0 ]->mss_flags |= MONITOR_F_OPENED; @@ -1919,76 +2399,86 @@ monitor_back_db_open( monitor_subsys_opened = 1; if ( mi->mi_entry_limbo ) { - entry_limbo_t *el = (entry_limbo_t *)mi->mi_entry_limbo; + entry_limbo_t *el = mi->mi_entry_limbo; for ( ; el; ) { entry_limbo_t *tmp; + int rc; switch ( el->el_type ) { case LIMBO_ENTRY: - monitor_back_register_entry( + rc = monitor_back_register_entry( el->el_e, - el->el_cb ); + el->el_cb, + el->el_mss, + el->el_flags ); break; case LIMBO_ENTRY_PARENT: - monitor_back_register_entry_parent( + rc = monitor_back_register_entry_parent( el->el_e, el->el_cb, - &el->el_base, + el->el_mss, + el->el_flags, + &el->el_nbase, el->el_scope, &el->el_filter ); break; case LIMBO_ATTRS: - monitor_back_register_entry_attrs( - &el->el_ndn, + rc = monitor_back_register_entry_attrs( + el->el_ndn, el->el_a, el->el_cb, - &el->el_base, + &el->el_nbase, el->el_scope, &el->el_filter ); break; case LIMBO_CB: - monitor_back_register_entry_callback( - &el->el_ndn, + rc = monitor_back_register_entry_callback( + el->el_ndn, el->el_cb, - &el->el_base, + &el->el_nbase, el->el_scope, &el->el_filter ); break; + case LIMBO_BACKEND: + rc = monitor_back_register_backend( el->el_bi ); + break; + + case LIMBO_DATABASE: + rc = monitor_back_register_database( el->el_be, el->el_ndn ); + break; + + case LIMBO_OVERLAY_INFO: + rc = monitor_back_register_overlay_info( el->el_on ); + break; + + case LIMBO_OVERLAY: + rc = monitor_back_register_overlay( el->el_be, el->el_on, el->el_ndn ); + break; + default: assert( 0 ); } - if ( el->el_e ) { - entry_free( el->el_e ); - } - if ( el->el_a ) { - attrs_free( el->el_a ); - } - if ( !BER_BVISNULL( &el->el_ndn ) ) { - ber_memfree( el->el_ndn.bv_val ); - } - if ( !BER_BVISNULL( &el->el_base ) ) { - ber_memfree( el->el_base.bv_val ); - } - if ( !BER_BVISNULL( &el->el_filter ) ) { - ber_memfree( el->el_filter.bv_val ); - } - tmp = el; el = el->el_next; - ch_free( tmp ); + monitor_back_destroy_limbo_entry( tmp, rc ); + + if ( rc != 0 ) { + /* try all, but report error at end */ + retcode = 1; + } } mi->mi_entry_limbo = NULL; } - return( 0 ); + return retcode; } int @@ -2025,7 +2515,8 @@ monitor_back_db_config( int monitor_back_db_destroy( - BackendDB *be ) + BackendDB *be, + ConfigReply *cr) { monitor_info_t *mi = ( monitor_info_t * )be->be_private; @@ -2055,6 +2546,16 @@ monitor_back_db_destroy( ch_free( monitor_subsys ); } + + if ( mi->mi_entry_limbo ) { + entry_limbo_t *el = mi->mi_entry_limbo; + + for ( ; el; ) { + entry_limbo_t *tmp = el; + el = el->el_next; + monitor_back_destroy_limbo_entry( tmp, 1 ); + } + } ldap_pvt_thread_mutex_destroy( &monitor_info.mi_cache_mutex );