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 61273a6839763d4f10120c274576b6bad75a4d4a..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-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -47,6 +47,7 @@ monitor_subsys_time_init(
        Entry           *e, **ep, *e_time;
        monitor_entry_t *mp;
        char            buf[ BACKMONITOR_BUFSIZE ];
+       struct berval bv;
 
        assert( be != NULL );
 
@@ -67,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: "
@@ -95,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 ) {
@@ -119,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: "
@@ -147,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 ) {