X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=2fff851887656720e1705ec74cb54f7982fbf770;hb=d2d574858005d9f81129a7502b663a5cd9c0f22d;hp=56085eeb736cc60b7f8048b17a1517192681475d;hpb=e2a15115b010b74ed5baf589614873994d9c36ec;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 56085eeb73..2fff851887 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -13,15 +13,20 @@
 void
 slap_op_free( Operation *op )
 {
-	if ( op->o_ber != NULL )
+	ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
+
+	if ( op->o_ber != NULL ) {
 		ber_free( op->o_ber, 1 );
+	}
 	if ( op->o_dn != NULL ) {
 		free( op->o_dn );
 	}
 	if ( op->o_ndn != NULL ) {
 		free( op->o_ndn );
 	}
-	/* pthread_mutex_destroy( &op->o_abandonmutex ); */
+
+	ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
+	ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
 	free( (char *) op );
 }
 
@@ -41,9 +46,9 @@ slap_op_add(
 	for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
 		;	/* NULL */
 
-	*tmp = (Operation *) calloc( 1, sizeof(Operation) );
-	pthread_mutex_init( &(*tmp)->o_abandonmutex,
-	    pthread_mutexattr_default );
+	*tmp = (Operation *) ch_calloc( 1, sizeof(Operation) );
+
+	ldap_pvt_thread_mutex_init( &(*tmp)->o_abandonmutex );
 	(*tmp)->o_ber = ber;
 	(*tmp)->o_msgid = msgid;
 	(*tmp)->o_tag = tag;
@@ -52,9 +57,9 @@ slap_op_add(
 	(*tmp)->o_dn = ch_strdup( dn != NULL ? dn : "" );
 	(*tmp)->o_ndn = dn_normalize_case( ch_strdup( (*tmp)->o_dn ) );
 
-	pthread_mutex_lock( &currenttime_mutex );
+	ldap_pvt_thread_mutex_lock( &currenttime_mutex );
 	(*tmp)->o_time = currenttime;
-	pthread_mutex_unlock( &currenttime_mutex );
+	ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
 	(*tmp)->o_opid = id;
 	(*tmp)->o_connid = connid;
 	(*tmp)->o_next = NULL;
@@ -73,6 +78,7 @@ slap_op_delete( Operation **olist, Operation *op )
 	if ( *tmp == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
 		    op->o_msgid, 0, 0 );
+		slap_op_free( op );
 		return; 
 	}