mp = ( monitor_entry_t * )e->e_private;
- if ( mp->mp_info && mp->mp_info->mss_update ) {
- rc = mp->mp_info->mss_update( op, rs, e );
- }
-
- if ( rc == SLAP_CB_CONTINUE && mp->mp_cb ) {
+ if ( mp->mp_cb ) {
struct monitor_callback_t *mc;
for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
}
}
+ if ( rc == SLAP_CB_CONTINUE && mp->mp_info && mp->mp_info->mss_update ) {
+ rc = mp->mp_info->mss_update( op, rs, e );
+ }
+
if ( rc == SLAP_CB_CONTINUE ) {
rc = LDAP_SUCCESS;
}
mp = ( monitor_entry_t * )e->e_private;
- if ( mp->mp_info && mp->mp_info->mss_modify ) {
- rc = mp->mp_info->mss_modify( op, rs, e );
- }
-
- if ( rc == SLAP_CB_CONTINUE && mp->mp_cb ) {
+ if ( mp->mp_cb ) {
struct monitor_callback_t *mc;
for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
}
}
+ if ( rc == SLAP_CB_CONTINUE && mp->mp_info && mp->mp_info->mss_modify ) {
+ rc = mp->mp_info->mss_modify( op, rs, e );
+ }
+
if ( rc == SLAP_CB_CONTINUE ) {
rc = LDAP_SUCCESS;
}
mp->mp_flags = MONITOR_F_NONE;
mp->mp_cb = NULL;
+ ldap_pvt_thread_mutex_init( &mp->mp_mutex );
+
return mp;
}
if ( rc )
return NULL;
- e = ch_calloc( 1, sizeof( Entry ));
+ e = entry_alloc();
if ( e ) {
struct berval nrdn;
rdnNormalize( 0, NULL, NULL, rdn, &nrdn, NULL );
build_new_dn( &e->e_name, pdn, rdn, NULL );
build_new_dn( &e->e_nname, pndn, &nrdn, NULL );
+ ber_memfree( nrdn.bv_val );
nat.bv_val = ptr + 1;
nat.bv_len = rdn->bv_len - ( nat.bv_val - rdn->bv_val );
attr_merge_normalize_one( e, slap_schema.si_ad_objectClass,