ITS#4587: selfwrite access is broken

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

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index a5ac6cf8a51a55c59b95123957cc7f2bd0f2ef33..8488a49bcf333cc0a08ce8c69be21761f1750f96 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -45,11 +45,21 @@ struct monitor_ops_t {
        { BER_BVNULL,                   BER_BVNULL }
 };
 
+static int
+monitor_subsys_ops_destroy(
+       BackendDB               *be,
+       monitor_subsys_t        *ms );
+
+static int
+monitor_subsys_ops_update(
+       Operation               *op,
+       SlapReply               *rs,
+       Entry                   *e );
+
 int
 monitor_subsys_ops_init(
        BackendDB               *be,
-       monitor_subsys_t        *ms
-)
+       monitor_subsys_t        *ms )
 {
        monitor_info_t  *mi;
        
@@ -61,6 +71,9 @@ monitor_subsys_ops_init(
 
        assert( be != NULL );
 
+       ms->mss_destroy = monitor_subsys_ops_destroy;
+       ms->mss_update = monitor_subsys_ops_update;
+
        mi = ( monitor_info_t * )be->be_private;
 
        if ( monitor_cache_get( mi,
@@ -152,24 +165,39 @@ monitor_subsys_ops_init(
        return( 0 );
 }
 
-int
+static int
+monitor_subsys_ops_destroy(
+       BackendDB               *be,
+       monitor_subsys_t        *ms )
+{
+       int             i;
+
+       for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+               if ( !BER_BVISNULL( &monitor_op[ i ].nrdn ) ) {
+                       ch_free( monitor_op[ i ].nrdn.bv_val );
+               }
+       }
+
+       return 0;
+}
+
+static int
 monitor_subsys_ops_update(
        Operation               *op,
        SlapReply               *rs,
-       Entry                   *e
-)
+       Entry                   *e )
 {
        monitor_info_t          *mi = ( monitor_info_t * )op->o_bd->be_private;
 
-       ldap_pvt_mp_t           nInitiated,
-                               nCompleted;
+       ldap_pvt_mp_t           nInitiated = LDAP_PVT_MP_INIT,
+                               nCompleted = LDAP_PVT_MP_INIT;
        struct berval           rdn;
        int                     i;
        Attribute               *a;
        static struct berval    bv_ops = BER_BVC( "cn=operations" );
 
-       assert( mi );
-       assert( e );
+       assert( mi != NULL );
+       assert( e != NULL );
 
        dnRdn( &e->e_nname, &rdn );