address ITS#4332; might remove dynamicObject counting

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

diff --git a/servers/slapd/back-monitor/time.c b/servers/slapd/back-monitor/time.c
index c7820d311ce5ba8c1ba5cfd17f434577d87f33e1..c8588e8048f3942b6a5f8f34ba8633718da3f8b2 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-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -31,20 +31,28 @@
 #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,
-       monitor_subsys_t        *ms
-)
+       monitor_subsys_t        *ms )
 {
        monitor_info_t  *mi;
        
        Entry           *e, **ep, *e_time;
        monitor_entry_t *mp;
        char            buf[ BACKMONITOR_BUFSIZE ];
+       struct berval bv;
 
        assert( be != NULL );
 
+       ms->mss_update = monitor_subsys_time_update;
+
        mi = ( monitor_info_t * )be->be_private;
 
        if ( monitor_cache_get( mi,
@@ -60,27 +68,9 @@ monitor_subsys_time_init(
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
-       snprintf( buf, sizeof( buf ),
-                       "dn: cn=Start,%s\n"
-                       "objectClass: %s\n"
-                       "structuralObjectClass: %s\n"
-                       "cn: Start\n"
-                       "%s: %s\n"
-                       "creatorsName: %s\n"
-                       "modifiersName: %s\n"
-                       "createTimestamp: %s\n"
-                       "modifyTimestamp: %s\n", 
-                       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,
-                       mi->mi_startTime.bv_val,
-                       mi->mi_creatorsName.bv_val,
-                       mi->mi_creatorsName.bv_val,
-                       mi->mi_startTime.bv_val,
-                       mi->mi_startTime.bv_val );
-
-       e = str2entry( buf );
+       BER_BVSTR( &bv, "cn=Start" );
+       e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+               mi->mi_oc_monitoredObject, mi, NULL, NULL );
        if ( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_time_init: "
@@ -88,6 +78,8 @@ monitor_subsys_time_init(
                        ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
+       attr_merge_normalize_one( e, mi->mi_ad_monitorTimestamp,
+               &mi->mi_startTime, NULL );
        
        mp = monitor_entrypriv_create();
        if ( mp == NULL ) {
@@ -112,27 +104,9 @@ monitor_subsys_time_init(
        /*
         * Current
         */
-       snprintf( buf, sizeof( buf ),
-                       "dn: cn=Current,%s\n"
-                       "objectClass: %s\n"
-                       "structuralObjectClass: %s\n"
-                       "cn: Current\n"
-                       "%s: %s\n"
-                       "creatorsName: %s\n"
-                       "modifiersName: %s\n"
-                       "createTimestamp: %s\n"
-                       "modifyTimestamp: %s\n",
-                       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,
-                       mi->mi_startTime.bv_val,
-                       mi->mi_creatorsName.bv_val,
-                       mi->mi_creatorsName.bv_val,
-                       mi->mi_startTime.bv_val,
-                       mi->mi_startTime.bv_val );
-
-       e = str2entry( buf );
+       BER_BVSTR( &bv, "cn=Current" );
+       e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+               mi->mi_oc_monitoredObject, mi, NULL, NULL );
        if ( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_time_init: "
@@ -140,6 +114,8 @@ monitor_subsys_time_init(
                        ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
+       attr_merge_normalize_one( e, mi->mi_ad_monitorTimestamp,
+               &mi->mi_startTime, NULL );
 
        mp = monitor_entrypriv_create();
        if ( mp == NULL ) {
@@ -166,18 +142,18 @@ monitor_subsys_time_init(
        return( 0 );
 }
 
-int
+static int
 monitor_subsys_time_update(
        Operation               *op,
-       Entry                   *e
-)
+       SlapReply               *rs,
+       Entry                   *e )
 {
        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 );
        
@@ -219,13 +195,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 );
+
+               /* FIXME: touch modifyTimestamp? */
        }
 
-       return( 0 );
+       return SLAP_CB_CONTINUE;
 }