X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fconn.c;h=28fc176b87bc72cdef6f314b2a5dc2451e3b808e;hb=6549cfc7d09511de67e113d602c4071599127e2c;hp=8f2a70fa10ae410ff44035a4b643feeab9900221;hpb=fedbb4fb3d9d52ad050d688a1f7bde66db34b836;p=openldap

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 8f2a70fa10..28fc176b87 100644
--- 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-2010 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,
@@ -223,7 +223,7 @@ monitor_subsys_conn_update(
 
 	} else if ( dn_match( &rdn, &current_bv ) ) {
 		Connection	*c;
-		int		connindex;
+		ber_socket_t	connindex;
 
 		for ( n = 0, c = connection_first( &connindex );
 				c != NULL;
@@ -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,
@@ -445,7 +445,7 @@ monitor_subsys_conn_create(
 
 	if ( ndn == NULL ) {
 		Connection	*c;
-		int		connindex;
+		ber_socket_t	connindex;
 		Entry		*e = NULL,
 				*e_tmp = NULL;
 
@@ -481,7 +481,7 @@ monitor_subsys_conn_create(
 
 	} else {
 		Connection		*c;
-		int			connindex;
+		ber_socket_t		connindex;
 		unsigned long 		connid;
 		char			*next = NULL;
 		static struct berval	nconn_bv = BER_BVC( "cn=connection " );