Commit f5de1d4a authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

import fix for entry modification via callback from HEAD

parent c4ac8c2e
...@@ -42,11 +42,7 @@ monitor_entry_update( ...@@ -42,11 +42,7 @@ monitor_entry_update(
mp = ( monitor_entry_t * )e->e_private; mp = ( monitor_entry_t * )e->e_private;
if ( mp->mp_info && mp->mp_info->mss_update ) { if ( mp->mp_cb ) {
rc = mp->mp_info->mss_update( op, rs, e );
}
if ( rc == SLAP_CB_CONTINUE && mp->mp_cb ) {
struct monitor_callback_t *mc; struct monitor_callback_t *mc;
for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) { for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
...@@ -59,6 +55,10 @@ monitor_entry_update( ...@@ -59,6 +55,10 @@ monitor_entry_update(
} }
} }
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 ) { if ( rc == SLAP_CB_CONTINUE ) {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
} }
...@@ -115,11 +115,7 @@ monitor_entry_modify( ...@@ -115,11 +115,7 @@ monitor_entry_modify(
mp = ( monitor_entry_t * )e->e_private; mp = ( monitor_entry_t * )e->e_private;
if ( mp->mp_info && mp->mp_info->mss_modify ) { if ( mp->mp_cb ) {
rc = mp->mp_info->mss_modify( op, rs, e );
}
if ( rc == SLAP_CB_CONTINUE && mp->mp_cb ) {
struct monitor_callback_t *mc; struct monitor_callback_t *mc;
for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) { for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
...@@ -132,6 +128,10 @@ monitor_entry_modify( ...@@ -132,6 +128,10 @@ monitor_entry_modify(
} }
} }
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 ) { if ( rc == SLAP_CB_CONTINUE ) {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment