Merge branch 'mdb.master'

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

diff --git a/servers/slapd/back-monitor/overlay.c b/servers/slapd/back-monitor/overlay.c
index cb741f2fd01eadb725df9a98a79205c9c7b34706..e34ce886abcb3c202a5e6ad03f908f9bb62c16bd 100644 (file)
--- a/servers/slapd/back-monitor/overlay.c
+++ b/servers/slapd/back-monitor/overlay.c
@@ -1,7 +1,7 @@
 /* overlay.c - deals with overlay subsystem */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Copyright 2001-2011 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -75,32 +75,10 @@ monitor_subsys_overlay_init(
                Entry           *e;
                BackendDB       *be;
 
-               snprintf( buf, sizeof( buf ),
-                               "dn: cn=Overlay %d,%s\n"
-                               "objectClass: %s\n"
-                               "structuralObjectClass: %s\n"
-                               "cn: Overlay %d\n"
-                               "%s: %s\n"
-                               "%s: %s\n"
-                               "creatorsName: %s\n"
-                               "modifiersName: %s\n"
-                               "createTimestamp: %s\n"
-                               "modifyTimestamp: %s\n",
-                               i,
-                               ms->mss_dn.bv_val,
-                               mi->mi_oc_monitoredObject->soc_cname.bv_val,
-                               mi->mi_oc_monitoredObject->soc_cname.bv_val,
-                               i,
-                               mi->mi_ad_monitoredInfo->ad_cname.bv_val,
-                                       on->on_bi.bi_type,
-                               mi->mi_ad_monitorRuntimeConfig->ad_cname.bv_val,
-                                       on->on_bi.bi_cf_ocs ? "TRUE" : "FALSE",
-                               mi->mi_creatorsName.bv_val,
-                               mi->mi_creatorsName.bv_val,
-                               mi->mi_startTime.bv_val,
-                               mi->mi_startTime.bv_val );
-               
-               e = str2entry( buf );
+               bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d", i );
+               bv.bv_val = buf;
+               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_overlay_init: "
@@ -108,8 +86,12 @@ monitor_subsys_overlay_init(
                                i, ms->mss_ndn.bv_val, 0 );
                        return( -1 );
                }
-               
                ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
+               attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
+               attr_merge_normalize_one( e, mi->mi_ad_monitorRuntimeConfig,
+                       on->on_bi.bi_cf_ocs ? (struct berval *)&slap_true_bv :
+                               (struct berval *)&slap_false_bv, NULL );
+               
                attr_merge_normalize_one( e_overlay, mi->mi_ad_monitoredInfo,
                                &bv, NULL );