From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 23 Jul 2005 15:55:29 +0000 (+0000)
Subject: same for overlays; fix typo ("Overlays" instead of "Overlay" in parent entry)
X-Git-Tag: OPENLDAP_AC_BP~228
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4655f128584794fe47b02469efd2261f8ab9ad97;p=openldap

same for overlays; fix typo ("Overlays" instead of "Overlay" in parent entry)
---

diff --git a/servers/slapd/back-monitor/back-monitor.h b/servers/slapd/back-monitor/back-monitor.h
index 80e8ce6b14..e85c76866d 100644
--- a/servers/slapd/back-monitor/back-monitor.h
+++ b/servers/slapd/back-monitor/back-monitor.h
@@ -193,7 +193,7 @@ enum {
 #define SLAPD_MONITOR_OPS_DN	\
 	SLAPD_MONITOR_OPS_RDN "," SLAPD_MONITOR_DN
 
-#define SLAPD_MONITOR_OVERLAY_NAME	"Overlay"
+#define SLAPD_MONITOR_OVERLAY_NAME	"Overlays"
 #define SLAPD_MONITOR_OVERLAY_RDN  \
 	SLAPD_MONITOR_AT "=" SLAPD_MONITOR_OVERLAY_NAME
 #define SLAPD_MONITOR_OVERLAY_DN   \
diff --git a/servers/slapd/back-monitor/overlay.c b/servers/slapd/back-monitor/overlay.c
index 568a808d2a..bc6610a7b8 100644
--- 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 );