upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-03 21:50:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove data when freed (blind fix to ITS#5607)

Browse source
This commit is contained in:
Pierangelo Masarati 2008-07-12 16:26:27 +00:00
parent 18a333bfcf
commit 9c5b22ceda
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
servers/slapd/back-sql/sql-wrap.c
View file

@ -462,18 +462,6 @@ backsql_open_db_handle(
return LDAP_SUCCESS;
}
int
backsql_free_db_conn( Operation *op, SQLHDBC dbh )
{
Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_conn()\n", 0, 0, 0 );
(void)backsql_close_db_handle( dbh );
Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_conn()\n", 0, 0, 0 );
return LDAP_SUCCESS;
}
static void *backsql_db_conn_dummy;
static void
@ -481,7 +469,22 @@ backsql_db_conn_keyfree(
void *key,
void *data )
{
backsql_close_db_handle( (SQLHDBC)data );
(void)backsql_close_db_handle( (SQLHDBC)data );
}
int
backsql_free_db_conn( Operation *op, SQLHDBC dbh )
{
Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_conn()\n", 0, 0, 0 );
(void)backsql_close_db_handle( dbh );
ldap_pvt_thread_pool_setkey( op->o_threadctx,
&backsql_db_conn_dummy, (void *)SQL_NULL_HDBC,
backsql_db_conn_keyfree, NULL, NULL );
Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_conn()\n", 0, 0, 0 );
return LDAP_SUCCESS;
}
int
@ -514,9 +517,8 @@ backsql_get_db_conn( Operation *op, SQLHDBC *dbhp )
}
if ( op->o_threadctx ) {
void *data = NULL;
void *data = (void *)dbh;
data = (void *)dbh;
ldap_pvt_thread_pool_setkey( op->o_threadctx,
&backsql_db_conn_dummy, data,
backsql_db_conn_keyfree, NULL, NULL );