import fix to back-monitor attribute normalization (ITS#3659)

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

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index bc315987206c0d22cf01f8891fb5a4b2af65a61c..0e90430883cdeb3b0b840ef25ad885cc00e019bc 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -2,7 +2,8 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,34 +18,6 @@
  * This work was initially developed by Pierangelo Masarati for inclusion
  * in OpenLDAP Software.
  */
-/* This is an altered version */
-/*
- * 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.
- */
 
 #include "portable.h"
 
@@ -67,7 +40,7 @@ static struct berval
                BER_BVC( "Search" ),
                BER_BVC( "Abandon" ),
                BER_BVC( "Extended" ),
-               { 0, NULL }
+               BER_BVNULL
        };
 
 int
@@ -81,6 +54,7 @@ monitor_subsys_ops_init(
        struct monitorentrypriv *mp;
        char                    buf[ BACKMONITOR_BUFSIZE ];
        int                     i;
+       struct berval           bv_zero = BER_BVC("0");
 
        assert( be != NULL );
 
@@ -103,6 +77,9 @@ monitor_subsys_ops_init(
                return( -1 );
        }
 
+       attr_merge_one( e_op, mi->mi_ad_monitorOpInitiated, &bv_zero, &bv_zero );
+       attr_merge_one( e_op, mi->mi_ad_monitorOpCompleted, &bv_zero, &bv_zero );
+
        e_tmp = NULL;
 
        for ( i = SLAP_OP_LAST; i-- > 0; ) {
@@ -190,7 +167,7 @@ monitor_subsys_ops_update(
 )
 {
        struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
-       long            nInitiated = -1, nCompleted = -1;
+       long            nInitiated = 0, nCompleted = 0;
        char            *rdnvalue;
        int             i;
        Attribute       *a;
@@ -201,17 +178,29 @@ monitor_subsys_ops_update(
 
        rdnvalue = e->e_dn + ( sizeof( "cn=" ) - 1 );
 
-       for (i = 0; i < SLAP_OP_LAST; i++ ) {
-               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;
+       if ( strncmp( rdnvalue, SLAPD_MONITOR_OPS_NAME,
+                               sizeof( SLAPD_MONITOR_OPS_NAME ) - 1 ) == 0 )
+       {
+               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+                       nInitiated += num_ops_initiated_[ i ];
+                       nCompleted += num_ops_completed_[ i ];
+               }
+               
+       } else {
+               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+                       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;
+                       }
                }
-       }
 
-       if ( i == SLAP_OP_LAST ) {
-               return( 0 );
+               if ( i == SLAP_OP_LAST ) {
+                       /* not found ... */
+                       return( 0 );
+               }
        }
 
        a = attr_find( e->e_attrs, mi->mi_ad_monitorOpInitiated );