#include <ac/string.h>, to get strlen(), strncmp() and strncasecmp().

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

diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index 7853a9faf1398f32f0ce2cbd87ac02a8b35b073f..2796ebbf205a937eca33ca4fc5de446718cdc2f1 100644 (file)
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -34,6 +34,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/string.h>
 
 #include "slap.h"
 #include "back-monitor.h"
@@ -48,7 +49,7 @@ monitor_subsys_thread_init(
 {
        struct monitorinfo      *mi;
        Entry                   *e;
-       static char             buf[1024];
+       static char             buf[ BACKMONITOR_BUFSIZE ];
        struct berval           bv;
 
        mi = ( struct monitorinfo * )be->be_private;
@@ -75,7 +76,7 @@ monitor_subsys_thread_init(
        bv.bv_val = buf;
        bv.bv_len = strlen( bv.bv_val );
 
-       attr_merge_one( e, monitor_ad_desc, &bv, NULL );
+       attr_merge_normalize_one( e, mi->ad_monitoredInfo, &bv, NULL );
 
        monitor_cache_release( mi, e );
 
@@ -84,19 +85,22 @@ monitor_subsys_thread_init(
 
 int 
 monitor_subsys_thread_update( 
-       struct monitorinfo      *mi,
+       Operation               *op,
        Entry                   *e
 )
 {
+       struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
        Attribute               *a;
        struct berval           *b = NULL;
-       char                    buf[1024];
+       char                    buf[ BACKMONITOR_BUFSIZE ];
+
+       assert( mi != NULL );
 
        snprintf( buf, sizeof( buf ), "backload=%d", 
                        ldap_pvt_thread_pool_backload( &connection_pool ) );
 
-       if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) {
-
+       a = attr_find( e->e_attrs, mi->ad_monitoredInfo );
+       if ( a != NULL ) {
                for ( b = a->a_vals; b[0].bv_val != NULL; b++ ) {
                        if ( strncmp( b[0].bv_val, "backload=", 
                                        sizeof( "backload=" ) - 1 ) == 0 ) {
@@ -112,7 +116,8 @@ monitor_subsys_thread_update(
 
                bv.bv_val = buf;
                bv.bv_len = strlen( buf );
-               attr_merge_one( e, monitor_ad_desc, &bv, NULL );
+               attr_merge_normalize_one( e, mi->ad_monitoredInfo,
+                               &bv, NULL );
        }
 
        return( 0 );