]> git.sur5r.net Git - openldap/commitdiff
fix previous commits
authorPierangelo Masarati <ando@openldap.org>
Tue, 4 Jan 2011 20:43:55 +0000 (20:43 +0000)
committerPierangelo Masarati <ando@openldap.org>
Tue, 4 Jan 2011 20:43:55 +0000 (20:43 +0000)
contrib/slapd-modules/vc/vc.c

index cb0c47b087dd416e3ea40db1f934f4e6ce6fc6dd..3a9b7e2f1f5efe8c59cacb9d93a33541ea9a46b9 100644 (file)
@@ -278,16 +278,16 @@ vc_exop(
                vc_conn_t tmp = { 0 };
 
                AC_MEMCPY( (char *)&tmp.conn, (const char *)cookie.bv_val, cookie.bv_len );
-               ldap_pvt_mutex_lock( &vc_mutex );
+               ldap_pvt_thread_mutex_lock( &vc_mutex );
                conn = (vc_conn_t *)avl_find( vc_tree, (caddr_t)&tmp, vc_conn_cmp );
                if ( conn == NULL || ( conn != NULL && conn->refcnt != 0 ) ) {
                        conn = NULL;
-                       ldap_pvt_mutex_unlock( &vc_mutex );
+                       ldap_pvt_thread_mutex_unlock( &vc_mutex );
                        rs->sr_err = LDAP_PROTOCOL_ERROR;
                        goto done;
                }
                conn->refcnt++;
-               ldap_pvt_mutex_unlock( &vc_mutex );
+               ldap_pvt_thread_mutex_unlock( &vc_mutex );
 
        } else {
                void *thrctx;
@@ -373,25 +373,25 @@ done:;
                        if ( conn->conn == NULL ) {
                                conn->conn = conn;
                                conn->refcnt--;
-                               ldap_pvt_mutex_lock( &vc_mutex );
+                               ldap_pvt_thread_mutex_lock( &vc_mutex );
                                rc = avl_insert( &vc_tree, (caddr_t)conn,
                                        vc_conn_cmp, vc_conn_dup );
-                               ldap_pvt_mutex_unlock( &vc_mutex );
+                               ldap_pvt_thread_mutex_unlock( &vc_mutex );
                                assert( rc == 0 );
 
                        } else {
-                               ldap_pvt_mutex_lock( &vc_mutex );
+                               ldap_pvt_thread_mutex_lock( &vc_mutex );
                                conn->refcnt--;
-                               ldap_pvt_mutex_unlock( &vc_mutex );
+                               ldap_pvt_thread_mutex_unlock( &vc_mutex );
                        }
 
                } else {
                        if ( conn->conn != NULL ) {
                                vc_conn_t *tmp;
 
-                               ldap_pvt_mutex_lock( &vc_mutex );
+                               ldap_pvt_thread_mutex_lock( &vc_mutex );
                                tmp = avl_delete( &vc_tree, (caddr_t)conn, vc_conn_cmp );
-                               ldap_pvt_mutex_unlock( &vc_mutex );
+                               ldap_pvt_thread_mutex_unlock( &vc_mutex );
                        }
                        SLAP_FREE( conn );
                }