Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 5426bd0f5042232086fbc2471397de89ffd4dce7..28fc176b87bc72cdef6f314b2a5dc2451e3b808e 100644 (file)
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2012 The OpenLDAP Foundation.
+ * Copyright 2001-2013 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -77,7 +77,7 @@ monitor_subsys_conn_init(
         */
        BER_BVSTR( &bv, "cn=Max File Descriptors" );
        e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
-               mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
+               mi->mi_oc_monitorCounterObject, NULL, NULL );
        
        if ( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -122,7 +122,7 @@ monitor_subsys_conn_init(
         */
        BER_BVSTR( &bv, "cn=Total" );
        e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
-               mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
+               mi->mi_oc_monitorCounterObject, NULL, NULL );
        
        if ( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -161,7 +161,7 @@ monitor_subsys_conn_init(
         */
        BER_BVSTR( &bv, "cn=Current" );
        e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
-               mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
+               mi->mi_oc_monitorCounterObject, NULL, NULL );
 
        if ( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -292,7 +292,7 @@ conn_create(
                "cn=Connection %ld", c->c_connid );
        bv.bv_val = buf;
        e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv, 
-               mi->mi_oc_monitorConnection, mi, &ctmbv, &mtmbv );
+               mi->mi_oc_monitorConnection, &ctmbv, &mtmbv );
 
        if ( e == NULL) {
                Debug( LDAP_DEBUG_ANY,