X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fdatabase.c;h=f09001ed2b0070e05e8d160f7789b91018a1563f;hb=7fa4cc5d38ffc192e87018347aa55874fcdd7a3b;hp=785305ca17c77553f8bfd1abce26feb4a3e4fa57;hpb=f036fff9e567e5bb677793ffe89413afed9c985d;p=openldap diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c index 785305ca17..f09001ed2b 100644 --- a/servers/slapd/back-monitor/database.c +++ b/servers/slapd/back-monitor/database.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2001-2004 The OpenLDAP Foundation. + * Copyright 2001-2007 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * All rights reserved. * @@ -23,18 +23,29 @@ #include #include +#include #include "slap.h" #include "back-monitor.h" #if defined(LDAP_SLAPI) #include "slapi.h" -static int monitor_back_add_plugin( Backend *be, Entry *e ); +static int monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e ); #endif /* defined(LDAP_SLAPI) */ -#if defined(SLAPD_LDAP) -#include "../back-ldap/back-ldap.h" -#endif /* defined(SLAPD_LDAP) */ +/* for PATH_MAX on some systems (e.g. Solaris) */ +#ifdef HAVE_LIMITS_H +#include +#endif /* HAVE_LIMITS_H */ +#ifndef PATH_MAX +#define PATH_MAX 4095 +#endif /* ! PATH_MAX */ + +static int +monitor_subsys_database_modify( + Operation *op, + SlapReply *rs, + Entry *e ); static struct restricted_ops_t { struct berval op; @@ -52,8 +63,8 @@ static struct restricted_ops_t { }, restricted_exops[] = { { BER_BVC( LDAP_EXOP_START_TLS ), SLAP_RESTRICT_EXOP_START_TLS }, { BER_BVC( LDAP_EXOP_MODIFY_PASSWD ), SLAP_RESTRICT_EXOP_MODIFY_PASSWD }, - { BER_BVC( LDAP_EXOP_X_WHO_AM_I ), SLAP_RESTRICT_EXOP_WHOAMI }, - { BER_BVC( LDAP_EXOP_X_CANCEL ), SLAP_RESTRICT_EXOP_CANCEL }, + { BER_BVC( LDAP_EXOP_WHO_AM_I ), SLAP_RESTRICT_EXOP_WHOAMI }, + { BER_BVC( LDAP_EXOP_CANCEL ), SLAP_RESTRICT_EXOP_CANCEL }, { BER_BVNULL, 0 } }; @@ -63,7 +74,7 @@ init_readOnly( monitor_info_t *mi, Entry *e, slap_mask_t restrictops ) struct berval *tf = ( ( restrictops & SLAP_RESTRICT_OP_MASK ) == SLAP_RESTRICT_OP_WRITES ) ? (struct berval *)&slap_true_bv : (struct berval *)&slap_false_bv; - return attr_merge_one( e, mi->mi_ad_readOnly, tf, NULL ); + return attr_merge_one( e, mi->mi_ad_readOnly, tf, tf ); } static int @@ -74,7 +85,8 @@ init_restrictedOperation( monitor_info_t *mi, Entry *e, slap_mask_t restrictops for ( i = 0; restricted_ops[ i ].op.bv_val; i++ ) { if ( restrictops & restricted_ops[ i ].tag ) { rc = attr_merge_one( e, mi->mi_ad_restrictedOperation, - &restricted_ops[ i ].op, NULL ); + &restricted_ops[ i ].op, + &restricted_ops[ i ].op ); if ( rc ) { return rc; } @@ -84,7 +96,8 @@ init_restrictedOperation( monitor_info_t *mi, Entry *e, slap_mask_t restrictops for ( i = 0; restricted_exops[ i ].op.bv_val; i++ ) { if ( restrictops & restricted_exops[ i ].tag ) { rc = attr_merge_one( e, mi->mi_ad_restrictedOperation, - &restricted_exops[ i ].op, NULL ); + &restricted_exops[ i ].op, + &restricted_exops[ i ].op ); if ( rc ) { return rc; } @@ -94,21 +107,363 @@ init_restrictedOperation( monitor_info_t *mi, Entry *e, slap_mask_t restrictops return LDAP_SUCCESS; } +static int +monitor_subsys_database_init_one( + monitor_info_t *mi, + BackendDB *be, + monitor_subsys_t *ms, + monitor_subsys_t *ms_backend, + monitor_subsys_t *ms_overlay, + struct berval *rdn, + Entry *e_database, + Entry ***epp ) +{ + char buf[ BACKMONITOR_BUFSIZE ]; + int j; + slap_overinfo *oi = NULL; + BackendInfo *bi, *bi2; + Entry *e; + monitor_entry_t *mp; + char *rdnval = strchr( rdn->bv_val, '=' ) + 1; + struct berval bv; + + bi = be->bd_info; + + if ( overlay_is_over( be ) ) { + oi = (slap_overinfo *)be->bd_info->bi_private; + bi = oi->oi_orig; + } + + /* Subordinates are not exposed as their own naming context */ + if ( SLAP_GLUE_SUBORDINATE( be ) ) { + return 0; + } + + e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, rdn, + mi->mi_oc_monitoredObject, mi, NULL, NULL ); + + if ( e == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to create entry \"%s,%s\"\n", + rdn->bv_val, ms->mss_dn.bv_val, 0 ); + return( -1 ); + } + + ber_str2bv( bi->bi_type, 0, 0, &bv ); + attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL ); + attr_merge_one( e, mi->mi_ad_monitorIsShadow, + SLAP_SHADOW( be ) ? (struct berval *)&slap_true_bv : + (struct berval *)&slap_false_bv, NULL ); + + if ( SLAP_MONITOR( be ) ) { + attr_merge( e, slap_schema.si_ad_monitorContext, + be->be_suffix, be->be_nsuffix ); + attr_merge( e_database, slap_schema.si_ad_monitorContext, + be->be_suffix, be->be_nsuffix ); + + } else { + if ( be->be_suffix == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "missing suffix for %s\n", + rdnval, 0, 0 ); + return -1; + } + attr_merge( e, slap_schema.si_ad_namingContexts, + be->be_suffix, be->be_nsuffix ); + attr_merge( e_database, slap_schema.si_ad_namingContexts, + be->be_suffix, be->be_nsuffix ); + } + + (void)init_readOnly( mi, e, be->be_restrictops ); + (void)init_restrictedOperation( mi, e, be->be_restrictops ); + + if ( SLAP_SHADOW( be ) && be->be_update_refs ) { + attr_merge_normalize( e, mi->mi_ad_monitorUpdateRef, + be->be_update_refs, NULL ); + } + + if ( oi != NULL ) { + slap_overinst *on = oi->oi_list, + *on1 = on; + + for ( ; on; on = on->on_next ) { + slap_overinst *on2; + + for ( on2 = on1; on2 != on; on2 = on2->on_next ) { + if ( on2->on_bi.bi_type == on->on_bi.bi_type ) { + break; + } + } + + if ( on2 != on ) { + break; + } + + ber_str2bv( on->on_bi.bi_type, 0, 0, &bv ); + attr_merge_normalize_one( e, mi->mi_ad_monitorOverlay, + &bv, NULL ); + + /* find the overlay number, j */ + for ( on2 = overlay_next( NULL ), j = 0; on2; on2 = overlay_next( on2 ), j++ ) { + if ( on2->on_bi.bi_type == on->on_bi.bi_type ) { + break; + } + } + assert( on2 != NULL ); + + snprintf( buf, sizeof( buf ), + "cn=Overlay %d,%s", + j, ms_overlay->mss_dn.bv_val ); + ber_str2bv( buf, 0, 0, &bv ); + attr_merge_normalize_one( e, + slap_schema.si_ad_seeAlso, + &bv, NULL ); + } + } + + j = -1; + LDAP_STAILQ_FOREACH( bi2, &backendInfo, bi_next ) { + j++; + if ( bi2->bi_type == bi->bi_type ) { + snprintf( buf, sizeof( buf ), + "cn=Backend %d,%s", + j, ms_backend->mss_dn.bv_val ); + bv.bv_val = buf; + bv.bv_len = strlen( buf ); + attr_merge_normalize_one( e, + slap_schema.si_ad_seeAlso, + &bv, NULL ); + break; + } + } + /* we must find it! */ + assert( j >= 0 ); + + mp = monitor_entrypriv_create(); + if ( mp == NULL ) { + return -1; + } + e->e_private = ( void * )mp; + mp->mp_info = ms; + mp->mp_flags = ms->mss_flags + | MONITOR_F_SUB; + + if ( monitor_cache_add( mi, e ) ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to add entry \"%s,%s\"\n", + rdn->bv_val, ms->mss_dn.bv_val, 0 ); + return( -1 ); + } + +#if defined(LDAP_SLAPI) + monitor_back_add_plugin( mi, be, e ); +#endif /* defined(LDAP_SLAPI) */ + + if ( oi != NULL ) { + Entry **ep_overlay = &mp->mp_children; + monitor_entry_t *mp_overlay; + slap_overinst *on = oi->oi_list; + int o; + + for ( o = 0; on; o++, on = on->on_next ) { + Entry *e_overlay; + slap_overinst *on2; + + /* find the overlay number, j */ + for ( on2 = overlay_next( NULL ), j = 0; on2; on2 = overlay_next( on2 ), j++ ) { + if ( on2->on_bi.bi_type == on->on_bi.bi_type ) { + break; + } + } + assert( on2 != NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d", o ); + bv.bv_val = buf; + + e_overlay = monitor_entry_stub( &e->e_name, &e->e_nname, &bv, + mi->mi_oc_monitoredObject, mi, NULL, NULL ); + + if ( e_overlay == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to create entry " + "\"cn=Overlay %d,%s,%s\"\n", + o, rdn->bv_val, ms->mss_dn.bv_val ); + return( -1 ); + } + ber_str2bv( on->on_bi.bi_type, 0, 0, &bv ); + attr_merge_one( e_overlay, mi->mi_ad_monitoredInfo, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d,%s", + j, ms_overlay->mss_dn.bv_val ); + bv.bv_val = buf; + attr_merge_normalize_one( e_overlay, slap_schema.si_ad_seeAlso, + &bv, NULL ); + + if ( SLAP_MONITOR( be ) ) { + attr_merge( e_overlay, slap_schema.si_ad_monitorContext, + be->be_suffix, be->be_nsuffix ); + + } else { + attr_merge( e_overlay, slap_schema.si_ad_namingContexts, + be->be_suffix, be->be_nsuffix ); + } + + mp_overlay = monitor_entrypriv_create(); + if ( mp_overlay == NULL ) { + return -1; + } + e_overlay->e_private = ( void * )mp_overlay; + mp_overlay->mp_info = ms; + mp_overlay->mp_flags = ms->mss_flags + | MONITOR_F_SUB; + + if ( monitor_cache_add( mi, e_overlay ) ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to add entry " + "\"cn=Overlay %d,%s,%s\"\n", + o, rdn->bv_val, ms->mss_dn.bv_val ); + return( -1 ); + } + + *ep_overlay = e_overlay; + ep_overlay = &mp_overlay->mp_next; + } + } + + **epp = e; + *epp = &mp->mp_next; + + return 0; +} + +int +monitor_back_register_database( + BackendDB *be ) +{ + monitor_info_t *mi; + Entry *e_database, **ep; + int i, rc; + monitor_entry_t *mp; + monitor_subsys_t *ms_backend, + *ms_database, + *ms_overlay; + struct berval bv; + char buf[ BACKMONITOR_BUFSIZE ]; + + assert( be_monitor != NULL ); + + if ( !monitor_subsys_is_opened() ) { + return monitor_back_register_database_limbo( be ); + } + + mi = ( monitor_info_t * )be_monitor->be_private; + + ms_backend = monitor_back_get_subsys( SLAPD_MONITOR_BACKEND_NAME ); + if ( ms_backend == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_back_register_database: " + "unable to get " + "\"" SLAPD_MONITOR_BACKEND_NAME "\" " + "subsystem\n", + 0, 0, 0 ); + return -1; + } + + ms_database = monitor_back_get_subsys( SLAPD_MONITOR_DATABASE_NAME ); + if ( ms_database == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_back_register_database: " + "unable to get " + "\"" SLAPD_MONITOR_DATABASE_NAME "\" " + "subsystem\n", + 0, 0, 0 ); + return -1; + } + + ms_overlay = monitor_back_get_subsys( SLAPD_MONITOR_OVERLAY_NAME ); + if ( ms_overlay == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_back_register_database: " + "unable to get " + "\"" SLAPD_MONITOR_OVERLAY_NAME "\" " + "subsystem\n", + 0, 0, 0 ); + return -1; + } + + if ( monitor_cache_get( mi, &ms_database->mss_ndn, &e_database ) ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to get entry \"%s\"\n", + ms_database->mss_ndn.bv_val, 0, 0 ); + return( -1 ); + } + + mp = ( monitor_entry_t * )e_database->e_private; + for ( i = -1, ep = &mp->mp_children; *ep; i++ ) { + Attribute *a; + + a = attr_find( (*ep)->e_attrs, slap_schema.si_ad_namingContexts ); + if ( a ) { + int j, k; + + for ( j = 0; !BER_BVISNULL( &a->a_nvals[ j ] ); j++ ) { + for ( k = 0; !BER_BVISNULL( &be->be_nsuffix[ k ] ); k++ ) { + if ( dn_match( &a->a_nvals[ j ], &be->be_nsuffix[ k ] ) ) { + rc = 0; + goto done; + } + } + } + } + + mp = ( monitor_entry_t * )(*ep)->e_private; + + assert( mp != NULL ); + ep = &mp->mp_next; + } + + bv.bv_val = buf; + bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Database %d", i ); + if ( bv.bv_len >= sizeof( buf ) ) { + rc = -1; + goto done; + } + + rc = monitor_subsys_database_init_one( mi, be, + ms_database, ms_backend, ms_overlay, &bv, e_database, &ep ); + if ( rc != 0 ) { + goto done; + } + +done:; + monitor_cache_release( mi, e_database ); + + return rc; +} + int monitor_subsys_database_init( BackendDB *be, - monitor_subsys_t *ms -) + monitor_subsys_t *ms ) { monitor_info_t *mi; Entry *e_database, **ep; - int i; + int i, rc; monitor_entry_t *mp; monitor_subsys_t *ms_backend, *ms_overlay; + struct berval bv; assert( be != NULL ); + ms->mss_modify = monitor_subsys_database_modify; + mi = ( monitor_info_t * )be->be_private; ms_backend = monitor_back_get_subsys( SLAPD_MONITOR_BACKEND_NAME ); @@ -148,155 +503,28 @@ monitor_subsys_database_init( mp->mp_children = NULL; ep = &mp->mp_children; - for ( i = 0; i < nBackendDB; i++ ) { - char buf[ BACKMONITOR_BUFSIZE ]; - int j; - slap_overinfo *oi = NULL; - BackendInfo *bi; - Entry *e; - - be = &backendDB[ i ]; - - bi = be->bd_info; - - if ( strcmp( be->bd_info->bi_type, "over" ) == 0 ) { - oi = (slap_overinfo *)be->bd_info->bi_private; - bi = oi->oi_orig; - } - - /* Subordinates are not exposed as their own naming context */ - if ( SLAP_GLUE_SUBORDINATE( be ) ) { - continue; - } - - snprintf( buf, sizeof( buf ), - "dn: cn=Database %d,%s\n" - "objectClass: %s\n" - "structuralObjectClass: %s\n" - "cn: Database %d\n" - "description: This object contains the type of the database.\n" - "%s: %s\n" - "creatorsName: %s\n" - "modifiersName: %s\n" - "createTimestamp: %s\n" - "modifyTimestamp: %s\n", - i, - ms->mss_dn.bv_val, - mi->mi_oc_monitoredObject->soc_cname.bv_val, - mi->mi_oc_monitoredObject->soc_cname.bv_val, - i, - mi->mi_ad_monitoredInfo->ad_cname.bv_val, - bi->bi_type, - mi->mi_creatorsName.bv_val, - mi->mi_creatorsName.bv_val, - mi->mi_startTime.bv_val, - mi->mi_startTime.bv_val ); - - e = str2entry( buf ); - if ( e == NULL ) { - Debug( LDAP_DEBUG_ANY, - "monitor_subsys_database_init: " - "unable to create entry \"cn=Database %d,%s\"\n", - i, ms->mss_ndn.bv_val, 0 ); - return( -1 ); - } - - if ( SLAP_MONITOR(be) ) { - attr_merge( e, slap_schema.si_ad_monitorContext, - be->be_suffix, be->be_nsuffix ); - attr_merge( e_database, slap_schema.si_ad_monitorContext, - be->be_suffix, be->be_nsuffix ); - } else { - attr_merge( e, slap_schema.si_ad_namingContexts, - be->be_suffix, be->be_nsuffix ); - attr_merge( e_database, slap_schema.si_ad_namingContexts, - be->be_suffix, be->be_nsuffix ); - } - - (void)init_readOnly( mi, e, be->be_restrictops ); - (void)init_restrictedOperation( mi, e, be->be_restrictops ); - - if ( oi != NULL ) { - slap_overinst *on = oi->oi_list; - - for ( ; on; on = on->on_next ) { - struct berval bv; - slap_overinst *on2; - - bv.bv_val = on->on_bi.bi_type; - bv.bv_len = strlen( bv.bv_val ); - attr_merge_normalize_one( e, mi->mi_ad_monitorOverlay, - &bv, NULL ); - - for ( on2 = overlay_next( NULL ), j = 0; on2; on2 = overlay_next( on2 ), j++ ) { - if ( on2->on_bi.bi_type == on->on_bi.bi_type ) { - break; - } - } - assert( on2 ); - - snprintf( buf, sizeof( buf ), - "cn=Overlay %d,%s", - j, ms_overlay->mss_dn.bv_val ); - bv.bv_val = buf; - bv.bv_len = strlen( buf ); - attr_merge_normalize_one( e, mi->mi_ad_seeAlso, - &bv, NULL ); - } - } - -#if defined(SLAPD_LDAP) - if ( strcmp( bi->bi_type, "ldap" ) == 0 ) { - struct ldapinfo *li = (struct ldapinfo *)be->be_private; - struct berval bv; + BER_BVSTR( &bv, "cn=Frontend" ); + rc = monitor_subsys_database_init_one( mi, frontendDB, + ms, ms_backend, ms_overlay, &bv, e_database, &ep ); + if ( rc != 0 ) { + return rc; + } - bv.bv_val = li->url; - bv.bv_len = strlen( bv.bv_val ); - attr_merge_normalize_one( e, slap_schema.si_ad_labeledURI, - &bv, NULL ); - } -#endif /* defined(SLAPD_LDAP) */ - - for ( j = 0; j < nBackendInfo; j++ ) { - if ( backendInfo[ j ].bi_type == bi->bi_type ) { - struct berval bv; - - snprintf( buf, sizeof( buf ), - "cn=Backend %d,%s", - j, ms_backend->mss_dn.bv_val ); - bv.bv_val = buf; - bv.bv_len = strlen( buf ); - attr_merge_normalize_one( e, mi->mi_ad_seeAlso, - &bv, NULL ); - break; - } - } - /* we must find it! */ - assert( j >= 0 ); + i = -1; + LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) { + char buf[ BACKMONITOR_BUFSIZE ]; - mp = monitor_entrypriv_create(); - if ( mp == NULL ) { + bv.bv_val = buf; + bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Database %d", ++i ); + if ( bv.bv_len >= sizeof( buf ) ) { return -1; } - e->e_private = ( void * )mp; - mp->mp_info = ms; - mp->mp_flags = ms->mss_flags - | MONITOR_F_SUB; - - if ( monitor_cache_add( mi, e ) ) { - Debug( LDAP_DEBUG_ANY, - "monitor_subsys_database_init: " - "unable to add entry \"cn=Database %d,%s\"\n", - i, ms->mss_ndn.bv_val, 0 ); - return( -1 ); + + rc = monitor_subsys_database_init_one( mi, be, + ms, ms_backend, ms_overlay, &bv, e_database, &ep ); + if ( rc != 0 ) { + return rc; } - -#if defined(LDAP_SLAPI) - monitor_back_add_plugin( be, e ); -#endif /* defined(LDAP_SLAPI) */ - - *ep = e; - ep = &mp->mp_next; } monitor_cache_release( mi, e_database ); @@ -350,16 +578,15 @@ value_mask( BerVarray v, slap_mask_t cur, slap_mask_t *delta ) return LDAP_SUCCESS; } -int +static int monitor_subsys_database_modify( Operation *op, - Entry *e -) + SlapReply *rs, + Entry *e ) { monitor_info_t *mi = (monitor_info_t *)op->o_bd->be_private; int rc = LDAP_OTHER; Attribute *save_attrs, *a; - Modifications *modlist = op->oq_modify.rs_modlist; Modifications *ml; Backend *be; int ro_gotval = 1, i, n; @@ -367,23 +594,33 @@ monitor_subsys_database_modify( struct berval *tf; i = sscanf( e->e_nname.bv_val, "cn=database %d,", &n ); - if ( i != 1 ) - return LDAP_UNWILLING_TO_PERFORM; + if ( i != 1 ) { + return SLAP_CB_CONTINUE; + } - if ( n < 0 || n >= nBackendDB ) - return LDAP_NO_SUCH_OBJECT; + if ( n < 0 || n >= nBackendDB ) { + rs->sr_text = "invalid database index"; + return ( rs->sr_err = LDAP_NO_SUCH_OBJECT ); + } + LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) { + if ( n == 0 ) { + break; + } + n--; + } /* do not allow some changes on back-monitor (needs work)... */ - be = &backendDB[ n ]; - if ( SLAP_MONITOR( be ) ) - return LDAP_UNWILLING_TO_PERFORM; + if ( SLAP_MONITOR( be ) ) { + rs->sr_text = "no modifications allowed to monitor database entry"; + return ( rs->sr_err = LDAP_UNWILLING_TO_PERFORM ); + } rp_cur = be->be_restrictops; save_attrs = e->e_attrs; e->e_attrs = attrs_dup( e->e_attrs ); - for ( ml=modlist; ml; ml=ml->sml_next ) { + for ( ml = op->orm_modlist; ml; ml = ml->sml_next ) { Modification *mod = &ml->sml_mod; if ( mod->sm_desc == mi->mi_ad_readOnly ) { @@ -391,7 +628,8 @@ monitor_subsys_database_modify( if ( mod->sm_values ) { if ( !BER_BVISNULL( &mod->sm_values[ 1 ] ) ) { - rc = LDAP_CONSTRAINT_VIOLATION; + rs->sr_text = "attempting to modify multiple values of single-valued attribute"; + rc = rs->sr_err = LDAP_CONSTRAINT_VIOLATION; goto done; } @@ -402,7 +640,8 @@ monitor_subsys_database_modify( val = 0; } else { - rc = LDAP_INVALID_SYNTAX; + assert( 0 ); + rc = rs->sr_err = LDAP_INVALID_SYNTAX; goto done; } } @@ -410,18 +649,18 @@ monitor_subsys_database_modify( switch ( mod->sm_op ) { case LDAP_MOD_DELETE: if ( ro_gotval < 1 ) { - rc = LDAP_CONSTRAINT_VIOLATION; + rc = rs->sr_err = LDAP_CONSTRAINT_VIOLATION; goto done; } ro_gotval--; if ( val == 0 && ( rp_cur & SLAP_RESTRICT_OP_WRITES ) == SLAP_RESTRICT_OP_WRITES ) { - rc = LDAP_NO_SUCH_ATTRIBUTE; + rc = rs->sr_err = LDAP_NO_SUCH_ATTRIBUTE; goto done; } if ( val == 1 && ( rp_cur & SLAP_RESTRICT_OP_WRITES ) != SLAP_RESTRICT_OP_WRITES ) { - rc = LDAP_NO_SUCH_ATTRIBUTE; + rc = rs->sr_err = LDAP_NO_SUCH_ATTRIBUTE; goto done; } @@ -433,7 +672,7 @@ monitor_subsys_database_modify( case LDAP_MOD_ADD: if ( ro_gotval > 0 ) { - rc = LDAP_CONSTRAINT_VIOLATION; + rc = rs->sr_err = LDAP_CONSTRAINT_VIOLATION; goto done; } ro_gotval++; @@ -451,7 +690,7 @@ monitor_subsys_database_modify( break; default: - rc = LDAP_OTHER; + rc = rs->sr_err = LDAP_OTHER; goto done; } @@ -491,12 +730,12 @@ monitor_subsys_database_modify( rp_delete &= ~mask; } else if ( rc == LDAP_OTHER ) { - rc = LDAP_TYPE_OR_VALUE_EXISTS; + rc = rs->sr_err = LDAP_TYPE_OR_VALUE_EXISTS; } break; default: - rc = LDAP_OTHER; + rc = rs->sr_err = LDAP_OTHER; break; } @@ -510,29 +749,29 @@ monitor_subsys_database_modify( rc = attr_merge( e, mod->sm_desc, mod->sm_values, mod->sm_nvalues ); if ( rc ) { - rc = LDAP_OTHER; + rc = rs->sr_err = LDAP_OTHER; break; } } else { - rc = LDAP_UNWILLING_TO_PERFORM; + rc = rs->sr_err = LDAP_UNWILLING_TO_PERFORM; break; } } /* sanity checks: */ if ( ro_gotval < 1 ) { - rc = LDAP_CONSTRAINT_VIOLATION; + rc = rs->sr_err = LDAP_CONSTRAINT_VIOLATION; goto done; } if ( ( rp_cur & SLAP_RESTRICT_OP_EXTENDED ) && ( rp_cur & SLAP_RESTRICT_EXOP_MASK ) ) { - rc = LDAP_CONSTRAINT_VIOLATION; + rc = rs->sr_err = LDAP_CONSTRAINT_VIOLATION; goto done; } if ( rp_delete & rp_add ) { - rc = LDAP_OTHER; + rc = rs->sr_err = LDAP_OTHER; goto done; } @@ -552,7 +791,7 @@ monitor_subsys_database_modify( if ( !bvmatch( &a->a_vals[ 0 ], tf ) ) { attr_delete( &e->e_attrs, mi->mi_ad_readOnly ); - rc = attr_merge_one( e, mi->mi_ad_readOnly, tf, NULL ); + rc = attr_merge_one( e, mi->mi_ad_readOnly, tf, tf ); } if ( rc == LDAP_SUCCESS ) { @@ -563,7 +802,7 @@ monitor_subsys_database_modify( } else { a = attr_find( e->e_attrs, mi->mi_ad_restrictedOperation ); if ( a == NULL ) { - rc = LDAP_OTHER; + rc = rs->sr_err = LDAP_OTHER; goto done; } @@ -623,14 +862,16 @@ monitor_subsys_database_modify( for ( i = 0; !BER_BVISNULL( &restricted_ops[ i ].op ); i++ ) { if ( rp_add & restricted_ops[ i ].tag ) { attr_merge_one( e, mi->mi_ad_restrictedOperation, - &restricted_ops[ i ].op, NULL ); + &restricted_ops[ i ].op, + &restricted_ops[ i ].op ); } } for ( i = 0; !BER_BVISNULL( &restricted_exops[ i ].op ); i++ ) { if ( rp_add & restricted_exops[ i ].tag ) { attr_merge_one( e, mi->mi_ad_restrictedOperation, - &restricted_exops[ i ].op, NULL ); + &restricted_exops[ i ].op, + &restricted_exops[ i ].op ); } } } @@ -641,6 +882,7 @@ monitor_subsys_database_modify( done:; if ( rc == LDAP_SUCCESS ) { attrs_free( save_attrs ); + rc = SLAP_CB_CONTINUE; } else { Attribute *tmp = e->e_attrs; @@ -652,11 +894,10 @@ done:; #if defined(LDAP_SLAPI) static int -monitor_back_add_plugin( Backend *be, Entry *e_database ) +monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e_database ) { Slapi_PBlock *pCurrentPB; int i, rc = LDAP_SUCCESS; - monitor_info_t *mi = ( monitor_info_t * )be->be_private; if ( slapi_int_pblock_get_first( be, &pCurrentPB ) != LDAP_SUCCESS ) { /* @@ -689,8 +930,7 @@ monitor_back_add_plugin( Backend *be, Entry *e_database ) srchdesc->spd_version, srchdesc->spd_description ); - bv.bv_val = buf; - bv.bv_len = strlen( buf ); + ber_str2bv( buf, 0, 0, &bv ); attr_merge_normalize_one( e_database, mi->mi_ad_monitoredInfo, &bv, NULL );