From fee10862c3197eb8f16e5f62860b9c015aaeda15 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 27 Apr 2005 18:33:22 +0000
Subject: [PATCH] fix attributeType DESC; #ifdef the legacy monitoredInfo
---
servers/slapd/back-monitor/conn.c | 10 +++++++++-
servers/slapd/back-monitor/init.c | 6 +++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 41c9534387..8bb3eb8f28 100644
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -28,6 +28,10 @@
#include "lutil.h"
#include "back-monitor.h"
+#ifndef LDAP_DEVEL
+#define MONITOR_LEGACY_CONN
+#endif
+
int
monitor_subsys_conn_init(
BackendDB *be,
@@ -312,7 +316,8 @@ conn_create(
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Connection %ld\n"
-
+
+#ifdef MONITOR_LEGACY_CONN
/* NOTE: this will disappear, as the exploded data
* has been moved to dedicated attributes */
"%s: "
@@ -328,6 +333,7 @@ conn_create(
": %s "
": %s "
": %s\n"
+#endif /* MONITOR_LEGACY_CONN */
"%s: %lu\n"
"%s: %ld\n"
@@ -362,6 +368,7 @@ conn_create(
mi->mi_oc_monitorConnection->soc_cname.bv_val,
c->c_connid,
+#ifdef MONITOR_LEGACY_CONN
mi->mi_ad_monitoredInfo->ad_cname.bv_val,
c->c_connid,
(long) c->c_protocol,
@@ -387,6 +394,7 @@ conn_create(
buf2,
buf3,
+#endif /* MONITOR_LEGACY_CONN */
mi->mi_ad_monitorConnectionNumber->ad_cname.bv_val,
c->c_connid,
diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index 65136ddcd2..67de593ad5 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -1138,21 +1138,21 @@ monitor_back_db_init(
offsetof(monitor_info_t, mi_ad_monitorConnectionOpsCompleted) },
{ "monitorConnectionGet", "( 1.3.6.1.4.1.4203.666.1.44 "
"NAME 'monitorConnectionGet' "
- "DESC 'monitor FIXME???' "
+ "DESC 'number of times connection_get() was called so far' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionGet) },
{ "monitorConnectionRead", "( 1.3.6.1.4.1.4203.666.1.45 "
"NAME 'monitorConnectionRead' "
- "DESC 'monitor FIXME???' "
+ "DESC 'number of times connection_read() was called so far' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionRead) },
{ "monitorConnectionWrite", "( 1.3.6.1.4.1.4203.666.1.46 "
"NAME 'monitorConnectionWrite' "
- "DESC 'monitor FIXME???' "
+ "DESC 'number of times connection_write() was called so far' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
--
GitLab