X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fbackend.c;h=9bef8a4fe38e84995d7220600ac24ee7c7478a62;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=aae18ed5442cae9f18b3b70b771cac456d503e9a;hpb=be8820d660c24532fc18e106b76572591c1485fa;p=openldap
diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index aae18ed544..9bef8a4fe3 100644
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -1,40 +1,29 @@
/* backend.c - deals with backend subsystem */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2001-2003 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved.
- *
- * This work has beed deveolped for the OpenLDAP Foundation
- * in the hope that it may be useful to the Open Source community,
- * but WITHOUT ANY WARRANTY.
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- * of use of this software, no matter how awful, even if they arise from
- * flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users
- * ever read sources, credits should appear in the documentation.
- * SysNet s.n.c. cannot be responsible for the consequences of the
- * alterations.
- *
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software.
*/
#include "portable.h"
#include
+#include
#include "slap.h"
#include "back-monitor.h"
@@ -74,7 +63,7 @@ monitor_subsys_backend_init(
e_tmp = NULL;
for ( i = nBackendInfo; i--; ) {
- char buf[1024];
+ char buf[ BACKMONITOR_BUFSIZE ];
BackendInfo *bi;
struct berval bv;
int j;
@@ -85,12 +74,16 @@ monitor_subsys_backend_init(
"dn: cn=Backend %d,%s\n"
"objectClass: %s\n"
"structuralObjectClass: %s\n"
- "cn: Backend %d\n",
+ "cn: Backend %d\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
i,
monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
- mi->oc_monitoredObject->soc_cname.bv_val,
- mi->oc_monitoredObject->soc_cname.bv_val,
- i );
+ mi->mi_oc_monitoredObject->soc_cname.bv_val,
+ mi->mi_oc_monitoredObject->soc_cname.bv_val,
+ i,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
@@ -113,9 +106,9 @@ monitor_subsys_backend_init(
bv.bv_val = bi->bi_type;
bv.bv_len = strlen( bv.bv_val );
- attr_merge_normalize_one( e, mi->ad_monitoredInfo,
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
&bv, NULL );
- attr_merge_normalize_one( e_backend, mi->ad_monitoredInfo,
+ attr_merge_normalize_one( e_backend, mi->mi_ad_monitoredInfo,
&bv, NULL );
if ( bi->bi_controls ) {
@@ -142,7 +135,7 @@ monitor_subsys_backend_init(
dn.bv_val = buf;
dn.bv_len = strlen( buf );
- attr_merge_normalize_one( e, mi->ad_seeAlso,
+ attr_merge_normalize_one( e, mi->mi_ad_seeAlso,
&dn, NULL );
}