publish updateref...

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

diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c
index dfcffc8e0f3a877261e727300df34424e5fe4c36..6600ee6ae13b0a438a7149d284b1482186025150 100644 (file)
--- a/servers/slapd/back-monitor/sent.c
+++ b/servers/slapd/back-monitor/sent.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.
  *
@@ -50,18 +50,18 @@ struct monitor_sent_t {
 int
 monitor_subsys_sent_init(
        BackendDB               *be,
-       monitorsubsys           *ms
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t  *mi;
        
-       Entry                   **ep, *e_sent;
-       struct monitorentrypriv *mp;
+       Entry           **ep, *e_sent;
+       monitor_entry_t *mp;
        int                     i;
 
        assert( be != NULL );
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
        if ( monitor_cache_get( mi, &ms->mss_ndn, &e_sent ) ) {
                Debug( LDAP_DEBUG_ANY,
@@ -71,7 +71,7 @@ monitor_subsys_sent_init(
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_sent->e_private;
+       mp = ( monitor_entry_t * )e_sent->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
@@ -114,7 +114,7 @@ monitor_subsys_sent_init(
                ber_dupbv( &monitor_sent[ i ].nrdn, &nrdn );
        
                BER_BVSTR( &bv, "0" );
-               attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
+               attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
        
                mp = monitor_entrypriv_create();
                if ( mp == NULL ) {
@@ -146,11 +146,10 @@ monitor_subsys_sent_init(
 int
 monitor_subsys_sent_update(
        Operation               *op,
-       Entry                   *e
-)
+       SlapReply               *rs,
+       Entry                   *e )
 {
-       struct monitorinfo      *mi = 
-               (struct monitorinfo *)op->o_bd->be_private;
+       monitor_info_t  *mi = ( monitor_info_t *)op->o_bd->be_private;
        
        struct berval           nrdn;
        ldap_pvt_mp_t           n;
@@ -169,7 +168,7 @@ monitor_subsys_sent_update(
        }
 
        if ( i == MONITOR_SENT_LAST ) {
-               return 0;
+               return SLAP_CB_CONTINUE;
        }
 
        ldap_pvt_thread_mutex_lock(&slap_counters.sc_sent_mutex);
@@ -202,6 +201,8 @@ monitor_subsys_sent_update(
        UI2BV( &a->a_vals[ 0 ], n );
        ldap_pvt_mp_clear( n );
 
-       return 0;
+       /* FIXME: touch modifyTimestamp? */
+
+       return SLAP_CB_CONTINUE;
 }