publish updateref...

[openldap] / servers / slapd / back-monitor / entry.c

diff --git a/servers/slapd/back-monitor/entry.c b/servers/slapd/back-monitor/entry.c
index 3c2b4ebf1c793b217cffae1f9c5d4cc4d253dbb3..aa8cfc0a0dc6276d945c8525cf0559d0301a7b17 100644 (file)
--- a/servers/slapd/back-monitor/entry.c
+++ b/servers/slapd/back-monitor/entry.c
@@ -27,12 +27,14 @@
 int
 monitor_entry_update(
        Operation               *op,
+       SlapReply               *rs,
        Entry                   *e
 )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        monitor_entry_t *mp;
-       int                     rc = 0;
+
+       int             rc = SLAP_CB_CONTINUE;
 
        assert( mi != NULL );
        assert( e != NULL );
@@ -41,34 +43,42 @@ monitor_entry_update(
        mp = ( monitor_entry_t * )e->e_private;
 
        if ( mp->mp_info && mp->mp_info->mss_update ) {
-               rc = ( *mp->mp_info->mss_update )( op, e );
+               rc = mp->mp_info->mss_update( op, rs, e );
        }
 
-       if ( rc == 0 && mp->mp_cb ) {
+       if ( rc == SLAP_CB_CONTINUE && mp->mp_cb ) {
                struct monitor_callback_t       *mc;
 
                for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
-                       rc = ( *mc->mc_update )( op, e, mc->mc_private );
-                       if ( rc != 0 ) {
-                               break;
+                       if ( mc->mc_update ) {
+                               rc = mc->mc_update( op, rs, e, mc->mc_private );
+                               if ( rc != SLAP_CB_CONTINUE ) {
+                                       break;
+                               }
                        }
                }
        }
 
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_SUCCESS;
+       }
+
        return rc;
 }
 
 int
 monitor_entry_create(
        Operation               *op,
+       SlapReply               *rs,
        struct berval           *ndn,
        Entry                   *e_parent,
-       Entry                   **ep
-)
+       Entry                   **ep )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        monitor_entry_t *mp;
 
+       int             rc = SLAP_CB_CONTINUE;
+
        assert( mi != NULL );
        assert( e_parent != NULL );
        assert( e_parent->e_private != NULL );
@@ -77,21 +87,28 @@ monitor_entry_create(
        mp = ( monitor_entry_t * )e_parent->e_private;
 
        if ( mp->mp_info && mp->mp_info->mss_create ) {
-               return ( *mp->mp_info->mss_create )( op, ndn, e_parent, ep );
+               rc = mp->mp_info->mss_create( op, rs, ndn, e_parent, ep );
+       }
+
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_SUCCESS;
        }
        
-       return( 0 );
+       return rc;
 }
 
 int
 monitor_entry_modify(
        Operation               *op,
+       SlapReply               *rs,
        Entry                   *e
 )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        monitor_entry_t *mp;
 
+       int             rc = SLAP_CB_CONTINUE;
+
        assert( mi != NULL );
        assert( e != NULL );
        assert( e->e_private != NULL );
@@ -99,10 +116,27 @@ monitor_entry_modify(
        mp = ( monitor_entry_t * )e->e_private;
 
        if ( mp->mp_info && mp->mp_info->mss_modify ) {
-               return ( *mp->mp_info->mss_modify )( op, e );
+               rc = mp->mp_info->mss_modify( op, rs, e );
        }
 
-       return( 0 );
+       if ( rc == SLAP_CB_CONTINUE && mp->mp_cb ) {
+               struct monitor_callback_t       *mc;
+
+               for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
+                       if ( mc->mc_modify ) {
+                               rc = mc->mc_modify( op, rs, e, mc->mc_private );
+                               if ( rc != SLAP_CB_CONTINUE ) {
+                                       break;
+                               }
+                       }
+               }
+       }
+
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_SUCCESS;
+       }
+
+       return rc;
 }
 
 int