mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-08-07 18:56:19 +00:00
parent a4352afef1
commit 125059ccb5
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
servers/slapd/back-sql/init.c
View File

@ -473,7 +473,17 @@ backsql_db_open(
"connection failed, exiting\n", 0, 0, 0 );
return 1;
}
(void)backsql_free_db_conn( op );
if ( backsql_free_db_conn( op ) != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
"connection free failed\n", 0, 0, 0 );
}
if ( !BACKSQL_SCHEMA_LOADED( bi ) ) {
Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
"test failed, schema map not loaded - exiting\n",
0, 0, 0 );
return 1;
}
/*
* Prepare ID selection query
@ -532,14 +542,6 @@ backsql_db_open(
&bi->sql_aliasing_quote, "dn", &bi->sql_aliasing_quote );
bi->sql_dn_oc_aliasing = bb.bb_val;
backsql_free_db_conn( op );
if ( !BACKSQL_SCHEMA_LOADED( bi ) ) {
Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
"test failed, schema map not loaded - exiting\n",
0, 0, 0 );
return 1;
}
/* should never happen! */
assert( bd->be_nsuffix != NULL );

7
servers/slapd/back-sql/sql-wrap.c
View File

@ -417,11 +417,14 @@ backsql_free_db_conn( Operation *op )
*/
if ( conn != NULL ) {
Debug( LDAP_DEBUG_TRACE, "backsql_free_db_conn(): "
"closing db connection\n", 0, 0, 0 );
"closing db connection %lu (%p)\n",
op->o_connid, conn, 0 );
backsql_close_db_conn( conn );
}
Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_conn()\n", 0, 0, 0 );
return SQL_SUCCESS;
return conn ? SQL_SUCCESS : SQL_ERROR;
}
int