plug more one-time leaks; rearrange subsystems setup

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

diff --git a/servers/slapd/back-monitor/time.c b/servers/slapd/back-monitor/time.c
index 2c894dd393e08a5e32ea5da4e0e4cf8c55bd35b9..61273a6839763d4f10120c274576b6bad75a4d4a 100644 (file)
--- a/servers/slapd/back-monitor/time.c
+++ b/servers/slapd/back-monitor/time.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.
  *
@@ -31,31 +31,39 @@
 #include "proto-slap.h"
 #include "back-monitor.h"
 
+static int
+monitor_subsys_time_update(
+       Operation               *op,
+       SlapReply               *rs,
+       Entry                   *e );
+
 int
 monitor_subsys_time_init(
-       BackendDB               *be
-)
+       BackendDB               *be,
+       monitor_subsys_t        *ms )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t  *mi;
        
-       Entry                   *e, **ep, *e_time;
-       struct monitorentrypriv *mp;
-       char                    buf[ BACKMONITOR_BUFSIZE ];
+       Entry           *e, **ep, *e_time;
+       monitor_entry_t *mp;
+       char            buf[ BACKMONITOR_BUFSIZE ];
 
        assert( be != NULL );
 
-       mi = ( struct monitorinfo * )be->be_private;
+       ms->mss_update = monitor_subsys_time_update;
+
+       mi = ( monitor_info_t * )be->be_private;
 
        if ( monitor_cache_get( mi,
-                       &monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn, &e_time ) ) {
+                       &ms->mss_ndn, &e_time ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_time_init: "
                        "unable to get entry \"%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_time->e_private;
+       mp = ( monitor_entry_t * )e_time->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
@@ -69,7 +77,7 @@ monitor_subsys_time_init(
                        "modifiersName: %s\n"
                        "createTimestamp: %s\n"
                        "modifyTimestamp: %s\n", 
-                       monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
+                       ms->mss_dn.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_ad_monitorTimestamp->ad_cname.bv_val,
@@ -84,23 +92,24 @@ monitor_subsys_time_init(
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_time_init: "
                        "unable to create entry \"cn=Start,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
        
-       mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+       mp = monitor_entrypriv_create();
+       if ( mp == NULL ) {
+               return -1;
+       }
        e->e_private = ( void * )mp;
-       mp->mp_next = NULL;
-       mp->mp_children = NULL;
-       mp->mp_info = &monitor_subsys[SLAPD_MONITOR_TIME];
-       mp->mp_flags = monitor_subsys[SLAPD_MONITOR_TIME].mss_flags \
+       mp->mp_info = ms;
+       mp->mp_flags = ms->mss_flags \
                | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
 
        if ( monitor_cache_add( mi, e ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_time_init: "
                        "unable to add entry \"cn=Start,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
        
@@ -120,7 +129,7 @@ monitor_subsys_time_init(
                        "modifiersName: %s\n"
                        "createTimestamp: %s\n"
                        "modifyTimestamp: %s\n",
-                       monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
+                       ms->mss_dn.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_ad_monitorTimestamp->ad_cname.bv_val,
@@ -135,23 +144,24 @@ monitor_subsys_time_init(
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_time_init: "
                        "unable to create entry \"cn=Current,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+       mp = monitor_entrypriv_create();
+       if ( mp == NULL ) {
+               return -1;
+       }
        e->e_private = ( void * )mp;
-       mp->mp_next = NULL;
-       mp->mp_children = NULL;
-       mp->mp_info = &monitor_subsys[SLAPD_MONITOR_TIME];
-       mp->mp_flags = monitor_subsys[SLAPD_MONITOR_TIME].mss_flags \
+       mp->mp_info = ms;
+       mp->mp_flags = ms->mss_flags \
                | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
 
        if ( monitor_cache_add( mi, e ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_time_init: "
                        "unable to add entry \"cn=Current,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
        
@@ -163,20 +173,18 @@ monitor_subsys_time_init(
        return( 0 );
 }
 
-int
+static int
 monitor_subsys_time_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;
        static struct berval    bv_current = BER_BVC( "cn=current" );
        struct berval           rdn;
 
-       assert( mi );
-       assert( e );
+       assert( mi != NULL );
+       assert( e != NULL );
 
        dnRdn( &e->e_nname, &rdn );
        
@@ -218,13 +226,15 @@ monitor_subsys_time_update(
 
                a = attr_find( e->e_attrs, mi->mi_ad_monitorTimestamp );
                if ( a == NULL ) {
-                       return( -1 );
+                       return rs->sr_err = LDAP_OTHER;
                }
 
-               assert( len == a->a_vals[0].bv_len );
-               AC_MEMCPY( a->a_vals[0].bv_val, tmbuf, len );
+               assert( len == a->a_vals[ 0 ].bv_len );
+               AC_MEMCPY( a->a_vals[ 0 ].bv_val, tmbuf, len );
+
+               /* FIXME: touch modifyTimestamp? */
        }
 
-       return( 0 );
+       return SLAP_CB_CONTINUE;
 }