Sync with HEAD

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

diff --git a/servers/slapd/back-monitor/overlay.c b/servers/slapd/back-monitor/overlay.c
index 568a808d2ac21ff30f4a6783e281ae5ef26c3f81..bc6610a7b8991e9911ed39b8e2b0e670fc947178 100644 (file)
--- a/servers/slapd/back-monitor/overlay.c
+++ b/servers/slapd/back-monitor/overlay.c
@@ -80,6 +80,8 @@ monitor_subsys_overlay_init(
                                "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"
@@ -89,6 +91,10 @@ monitor_subsys_overlay_init(
                                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,
@@ -104,8 +110,6 @@ monitor_subsys_overlay_init(
                }
                
                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_overlay, mi->mi_ad_monitoredInfo,
                                &bv, NULL );