X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Foperation.c;h=29959ac2e7a108ba2de5981bec1b28e29d3becee;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=928b5bf0e33c9d72bbb352355e2806c06dcdc257;hpb=be8820d660c24532fc18e106b76572591c1485fa;p=openldap

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index 928b5bf0e3..29959ac2e7 100644
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -1,39 +1,28 @@
 /* operation.c - deal with operation subsystem */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- * 
- * 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 <stdio.h>
+#include <ac/string.h>
 
 #include "slap.h"
 #include "back-monitor.h"
@@ -50,7 +39,8 @@ static struct berval
 		BER_BVC( "Compare" ),
 		BER_BVC( "Search" ),
 		BER_BVC( "Abandon" ),
-		BER_BVC( "Extended" )
+		BER_BVC( "Extended" ),
+		{ 0, NULL }
 	};
 
 int
@@ -62,7 +52,7 @@ monitor_subsys_ops_init(
 	
 	Entry			*e, *e_tmp, *e_op;
 	struct monitorentrypriv	*mp;
-	char			buf[1024];
+	char			buf[ BACKMONITOR_BUFSIZE ];
 	int 			i;
 
 	assert( be != NULL );
@@ -99,14 +89,18 @@ monitor_subsys_ops_init(
 				"structuralObjectClass: %s\n"
 				"cn: %s\n"
 				"%s: 0\n"
-				"%s: 0\n",
+				"%s: 0\n"
+				"createTimestamp: %s\n"
+				"modifyTimestamp: %s\n",
 				bv_op[ i ].bv_val,
 				monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val,
-				mi->oc_monitorOperation->soc_cname.bv_val,
-				mi->oc_monitorOperation->soc_cname.bv_val,
+				mi->mi_oc_monitorOperation->soc_cname.bv_val,
+				mi->mi_oc_monitorOperation->soc_cname.bv_val,
 				bv_op[ i ].bv_val,
-				mi->ad_monitorOpInitiated->ad_cname.bv_val,
-				mi->ad_monitorOpCompleted->ad_cname.bv_val );
+				mi->mi_ad_monitorOpInitiated->ad_cname.bv_val,
+				mi->mi_ad_monitorOpCompleted->ad_cname.bv_val,
+				mi->mi_startTime.bv_val,
+				mi->mi_startTime.bv_val );
 
 		e = str2entry( buf );
 		if ( e == NULL ) {
@@ -172,7 +166,6 @@ monitor_subsys_ops_update(
 	long 		nInitiated = -1, nCompleted = -1;
 	char 		*rdnvalue;
 	int 		i;
-	ber_len_t 	len;
 	Attribute	*a;
 	char		buf[] = "+9223372036854775807L";
 
@@ -182,9 +175,8 @@ monitor_subsys_ops_update(
 	rdnvalue = e->e_dn + ( sizeof( "cn=" ) - 1 );
 
 	for (i = 0; i < SLAP_OP_LAST; i++ ) {
-		len = bv_op[ i ].bv_len;
-
-		if ( strncmp( rdnvalue, bv_op[ i ].bv_val, len ) == 0 ) {
+		if ( strncmp( rdnvalue, bv_op[ i ].bv_val, 
+					bv_op[ i ].bv_len ) == 0 ) {
 			nInitiated = num_ops_initiated_[ i ];
 			nCompleted = num_ops_completed_[ i ];
 			break;
@@ -195,13 +187,13 @@ monitor_subsys_ops_update(
 		return( 0 );
 	}
 
-	a = attr_find( e->e_attrs, mi->ad_monitorOpInitiated );
+	a = attr_find( e->e_attrs, mi->mi_ad_monitorOpInitiated );
 	assert ( a != NULL );
 	snprintf( buf, sizeof( buf ), "%ld", nInitiated );
 	free( a->a_vals[ 0 ].bv_val );
 	ber_str2bv( buf, 0, 1, &a->a_vals[ 0 ] );
 
-	a = attr_find( e->e_attrs, mi->ad_monitorOpCompleted );
+	a = attr_find( e->e_attrs, mi->mi_ad_monitorOpCompleted );
 	assert ( a != NULL );
 	snprintf( buf, sizeof( buf ), "%ld", nCompleted );
 	free( a->a_vals[ 0 ].bv_val );