X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fentry.c;h=aa8cfc0a0dc6276d945c8525cf0559d0301a7b17;hb=63e843d2003ddf20f3725ad439991e769ffc792a;hp=869f37c79cef582b46ebf353b298d1687e286d95;hpb=3743579870464e52f9dfa5b423e5146d32a14dc8;p=openldap

diff --git a/servers/slapd/back-monitor/entry.c b/servers/slapd/back-monitor/entry.c
index 869f37c79c..aa8cfc0a0d 100644
--- a/servers/slapd/back-monitor/entry.c
+++ b/servers/slapd/back-monitor/entry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2005 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -27,26 +27,40 @@
 int
 monitor_entry_update(
 	Operation		*op,
+	SlapReply		*rs,
 	Entry 			*e
 )
 {
-	struct monitorinfo	*mi =
-		(struct monitorinfo *)op->o_bd->be_private;
-	struct monitorentrypriv *mp;
-	int			rc = 0;
+	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 );
 
-	mp = ( struct monitorentrypriv * )e->e_private;
+	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 == SLAP_CB_CONTINUE && mp->mp_cb ) {
+		struct monitor_callback_t	*mc;
+
+		for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
+			if ( mc->mc_update ) {
+				rc = mc->mc_update( op, rs, e, mc->mc_private );
+				if ( rc != SLAP_CB_CONTINUE ) {
+					break;
+				}
+			}
+		}
 	}
 
-	if ( rc == 0 && mp->mp_update ) {
-		rc = ( *mp->mp_update )( op, e );
+	if ( rc == SLAP_CB_CONTINUE ) {
+		rc = LDAP_SUCCESS;
 	}
 
 	return rc;
@@ -55,53 +69,79 @@ monitor_entry_update(
 int
 monitor_entry_create(
 	Operation		*op,
+	SlapReply		*rs,
 	struct berval		*ndn,
 	Entry			*e_parent,
-	Entry			**ep
-)
+	Entry			**ep )
 {
-	struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
-	struct monitorentrypriv *mp;
+	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 );
 	assert( ep != NULL );
 
-	mp = ( struct monitorentrypriv * )e_parent->e_private;
+	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
 )
 {
-	struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
-	struct monitorentrypriv *mp;
+	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 );
 
-	mp = ( struct monitorentrypriv * )e->e_private;
+	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 );
+	}
+
+	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;
+				}
+			}
+		}
 	}
 
-	return( 0 );
+	if ( rc == SLAP_CB_CONTINUE ) {
+		rc = LDAP_SUCCESS;
+	}
+
+	return rc;
 }
 
 int
 monitor_entry_test_flags(
-	struct monitorentrypriv	*mp,
+	monitor_entry_t		*mp,
 	int			cond
 )
 {
@@ -110,19 +150,18 @@ monitor_entry_test_flags(
 	return( ( mp->mp_flags & cond ) || ( mp->mp_info->mss_flags & cond ) );
 }
 
-struct monitorentrypriv *
+monitor_entry_t *
 monitor_entrypriv_create( void )
 {
-	struct monitorentrypriv	*mp;
+	monitor_entry_t	*mp;
 
-	mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+	mp = ( monitor_entry_t * )ch_calloc( sizeof( monitor_entry_t ), 1 );
 
 	mp->mp_next = NULL;
 	mp->mp_children = NULL;
 	mp->mp_info = NULL;
 	mp->mp_flags = MONITOR_F_NONE;
-	mp->mp_update = NULL;
-	mp->mp_private = NULL;
+	mp->mp_cb = NULL;
 
 	return mp;
 }