Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-monitor/rww.c b/servers/slapd/back-monitor/rww.c
index 7571d320a0ff7348553dcc17f251ee68ac384675..61ac1c952c00ba96336d3c7863a76d4acdf9cdc1 100644 (file)
--- a/servers/slapd/back-monitor/rww.c
+++ b/servers/slapd/back-monitor/rww.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2011 The OpenLDAP Foundation.
+ * Copyright 2001-2013 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -90,7 +90,7 @@ monitor_subsys_rww_init(
                Entry                   *e;
                
                e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &monitor_rww[i].rdn,
-                       mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
+                       mi->mi_oc_monitorCounterObject, NULL, NULL );
                if ( e == NULL ) {
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_rww_init: "
@@ -155,7 +155,7 @@ monitor_subsys_rww_update(
 {
        monitor_info_t *mi = (monitor_info_t *)op->o_bd->be_private;
        Connection      *c;
-       int             connindex;
+       ber_socket_t    connindex;
        long            nconns, nwritewaiters, nreadwaiters;
 
        int             i;