X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Fsql-wrap.c;h=aaa0a1ac640b2feef89f8442f2e4b9f72454b89b;hb=40cac2e37a45cbe2ce5fb69e902ad602baf65284;hp=7709f817de9cc4da892c1d4339ae8bf60a54c530;hpb=a8674f59d735094c1dc09c0f68eb0518a570a469;p=openldap
diff --git a/servers/slapd/back-sql/sql-wrap.c b/servers/slapd/back-sql/sql-wrap.c
index 7709f817de..aaa0a1ac64 100644
--- a/servers/slapd/back-sql/sql-wrap.c
+++ b/servers/slapd/back-sql/sql-wrap.c
@@ -1,8 +1,10 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
* Portions Copyright 1999 Dmitry Kovalev.
+ * Portions Copyright 2002 Pierangelo Masarati.
+ * Portions Copyright 2004 Mark Adamson.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,25 +17,23 @@
*/
/* ACKNOWLEDGEMENTS:
* This work was initially developed by Dmitry Kovalev for inclusion
- * by OpenLDAP Software.
+ * by OpenLDAP Software. Additional significant contributors include
+ * Pierangelo Masarati and Mark Adamson.
*/
#include "portable.h"
-#ifdef SLAPD_SQL
-
#include
#include "ac/string.h"
#include
#include "slap.h"
-#include "ldap_pvt.h"
#include "proto-sql.h"
#define MAX_ATTR_LEN 16384
-typedef struct backsql_conn {
- int ldap_cid;
+typedef struct backsql_db_conn {
+ unsigned long ldap_cid;
SQLHDBC dbh;
} backsql_db_conn;
@@ -61,8 +61,6 @@ RETCODE
backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout )
{
RETCODE rc;
- char drv_name[ 30 ];
- SWORD len;
rc = SQLAllocStmt( dbh, sth );
if ( rc != SQL_SUCCESS ) {
@@ -73,34 +71,43 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout )
Debug( LDAP_DEBUG_TRACE, "==>backsql_Prepare()\n", 0, 0, 0 );
#endif /* BACKSQL_TRACE */
- SQLGetInfo( dbh, SQL_DRIVER_NAME, drv_name, sizeof( drv_name ), &len );
+#ifdef BACKSQL_MSSQL_WORKAROUND
+ {
+ char drv_name[ 30 ];
+ SWORD len;
+
+ SQLGetInfo( dbh, SQL_DRIVER_NAME, drv_name, sizeof( drv_name ), &len );
#ifdef BACKSQL_TRACE
- Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): driver name=\"%s\"\n",
- drv_name, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): driver name=\"%s\"\n",
+ drv_name, 0, 0 );
#endif /* BACKSQL_TRACE */
- ldap_pvt_str2upper( drv_name );
- if ( !strncmp( drv_name, "SQLSRV32.DLL", sizeof( drv_name ) ) ) {
- /*
- * stupid default result set in MS SQL Server
- * does not support multiple active statements
- * on the same connection -- so we are trying
- * to make it not to use default result set...
- */
- Debug( LDAP_DEBUG_TRACE, "_SQLprepare(): "
- "enabling MS SQL Server default result "
- "set workaround\n", 0, 0, 0 );
- rc = SQLSetStmtOption( *sth, SQL_CONCURRENCY,
- SQL_CONCUR_ROWVER );
- if ( rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO ) {
- Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): "
- "SQLSetStmtOption(SQL_CONCURRENCY,"
- "SQL_CONCUR_ROWVER) failed:\n",
- 0, 0, 0 );
- backsql_PrintErrors( SQL_NULL_HENV, dbh, *sth, rc );
+ ldap_pvt_str2upper( drv_name );
+ if ( !strncmp( drv_name, "SQLSRV32.DLL", STRLENOF( "SQLSRV32.DLL" ) ) ) {
+ /*
+ * stupid default result set in MS SQL Server
+ * does not support multiple active statements
+ * on the same connection -- so we are trying
+ * to make it not to use default result set...
+ */
+ Debug( LDAP_DEBUG_TRACE, "_SQLprepare(): "
+ "enabling MS SQL Server default result "
+ "set workaround\n", 0, 0, 0 );
+ rc = SQLSetStmtOption( *sth, SQL_CONCURRENCY,
+ SQL_CONCUR_ROWVER );
+ if ( rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO ) {
+ Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): "
+ "SQLSetStmtOption(SQL_CONCURRENCY,"
+ "SQL_CONCUR_ROWVER) failed:\n",
+ 0, 0, 0 );
+ backsql_PrintErrors( SQL_NULL_HENV, dbh, *sth, rc );
+ SQLFreeStmt( *sth, SQL_DROP );
+ return rc;
+ }
}
}
+#endif /* BACKSQL_MSSQL_WORKAROUND */
if ( timeout > 0 ) {
Debug( LDAP_DEBUG_TRACE, "_SQLprepare(): "
@@ -109,6 +116,8 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout )
rc = SQLSetStmtOption( *sth, SQL_QUERY_TIMEOUT, timeout );
if ( rc != SQL_SUCCESS ) {
backsql_PrintErrors( SQL_NULL_HENV, dbh, *sth, rc );
+ SQLFreeStmt( *sth, SQL_DROP );
+ return rc;
}
}
@@ -117,11 +126,11 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout )
0, 0, 0 );
#endif /* BACKSQL_TRACE */
- return SQLPrepare( *sth, query, SQL_NTS );
+ return SQLPrepare( *sth, (SQLCHAR *)query, SQL_NTS );
}
RETCODE
-backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
+backsql_BindRowAsStrings_x( SQLHSTMT sth, BACKSQL_ROW_NTS *row, void *ctx )
{
RETCODE rc;
SQLCHAR colname[ 64 ];
@@ -152,62 +161,45 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
"ncols=%d\n", (int)row->ncols, 0, 0 );
#endif /* BACKSQL_TRACE */
- row->col_names = (BerVarray)ch_calloc( row->ncols + 1,
- sizeof( struct berval ) );
- row->cols = (char **)ch_calloc( row->ncols + 1,
- sizeof( char * ) );
- row->col_prec = (UDWORD *)ch_calloc( row->ncols,
- sizeof( UDWORD ) );
- row->value_len = (SQLINTEGER *)ch_calloc( row->ncols,
- sizeof( SQLINTEGER ) );
+ row->col_names = (BerVarray)ber_memcalloc_x( row->ncols + 1,
+ sizeof( struct berval ), ctx );
+ row->cols = (char **)ber_memcalloc_x( row->ncols + 1,
+ sizeof( char * ), ctx );
+ row->col_prec = (UDWORD *)ber_memcalloc_x( row->ncols,
+ sizeof( UDWORD ), ctx );
+ row->value_len = (SQLINTEGER *)ber_memcalloc_x( row->ncols,
+ sizeof( SQLINTEGER ), ctx );
for ( i = 1; i <= row->ncols; i++ ) {
rc = SQLDescribeCol( sth, (SQLSMALLINT)i, &colname[ 0 ],
(SQLUINTEGER)( sizeof( colname ) - 1 ),
&name_len, &col_type,
&col_prec, &col_scale, &col_null );
- ber_str2bv( colname, 0, 1, &row->col_names[ i - 1 ] );
+ /* FIXME: test rc? */
+
+ ber_str2bv_x( (char *)colname, 0, 1,
+ &row->col_names[ i - 1 ], ctx );
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "backsql_BindRowAsStrings: "
"col_name=%s, col_prec[%d]=%d\n",
colname, (int)i, (int)col_prec );
#endif /* BACKSQL_TRACE */
- if ( col_type == SQL_LONGVARCHAR
- || col_type == SQL_LONGVARBINARY) {
-#if 0
- row->cols[ i - 1 ] = NULL;
- row->col_prec[ i - 1 ] = -1;
-
- /*
- * such fields must be handled
- * in some other way since they return 2G
- * as their precision (at least it does so
- * with MS SQL Server w/native driver)
- * for now, we just set fixed precision
- * for such fields - dirty hack, but...
- * no time to deal with SQLGetData()
- */
-#endif
+ if ( col_type != SQL_CHAR && col_type != SQL_VARCHAR )
+ {
col_prec = MAX_ATTR_LEN;
- row->cols[ i - 1 ] = (char *)ch_calloc( col_prec + 1, sizeof( char ) );
- row->col_prec[ i - 1 ] = col_prec;
- rc = SQLBindCol( sth, (SQLUSMALLINT)i,
- SQL_C_CHAR,
- (SQLPOINTER)row->cols[ i - 1 ],
- col_prec + 1,
- &row->value_len[ i - 1 ] );
- } else {
- row->cols[ i - 1 ] = (char *)ch_calloc( col_prec + 1, sizeof( char ) );
- row->col_prec[ i - 1 ] = col_prec;
- rc = SQLBindCol( sth, (SQLUSMALLINT)i,
- SQL_C_CHAR,
- (SQLPOINTER)row->cols[ i - 1 ],
- col_prec + 1,
- &row->value_len[ i - 1 ] );
}
+
+ row->cols[ i - 1 ] = (char *)ber_memcalloc_x( col_prec + 1,
+ sizeof( char ), ctx );
+ row->col_prec[ i - 1 ] = col_prec;
+ rc = SQLBindCol( sth, (SQLUSMALLINT)i,
+ SQL_C_CHAR,
+ (SQLPOINTER)row->cols[ i - 1 ],
+ col_prec + 1,
+ &row->value_len[ i - 1 ] );
+ /* FIXME: test rc? */
}
- row->col_names[ i - 1 ].bv_val = NULL;
- row->col_names[ i - 1 ].bv_len = 0;
+ BER_BVZERO( &row->col_names[ i - 1 ] );
row->cols[ i - 1 ] = NULL;
}
@@ -219,20 +211,33 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
}
RETCODE
-backsql_FreeRow( BACKSQL_ROW_NTS *row )
+backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
+{
+ return backsql_BindRowAsStrings_x( sth, row, NULL );
+}
+
+RETCODE
+backsql_FreeRow_x( BACKSQL_ROW_NTS *row, void *ctx )
{
if ( row->cols == NULL ) {
return SQL_ERROR;
}
- ber_bvarray_free( row->col_names );
- ldap_charray_free( row->cols );
- free( row->col_prec );
- free( row->value_len );
+ ber_bvarray_free_x( row->col_names, ctx );
+ ber_memvfree_x( (void **)row->cols, ctx );
+ ber_memfree_x( row->col_prec, ctx );
+ ber_memfree_x( row->value_len, ctx );
return SQL_SUCCESS;
}
+
+RETCODE
+backsql_FreeRow( BACKSQL_ROW_NTS *row )
+{
+ return backsql_FreeRow_x( row, NULL );
+}
+
static int
backsql_cmp_connid( const void *v_c1, const void *v_c2 )
{
@@ -248,10 +253,13 @@ backsql_cmp_connid( const void *v_c1, const void *v_c2 )
return 0;
}
-static int
-backsql_close_db_conn( backsql_db_conn *conn )
+static void
+backsql_close_db_conn( void *v_conn )
{
- Debug( LDAP_DEBUG_TRACE, "==>backsql_close_db_conn()\n", 0, 0, 0 );
+ backsql_db_conn *conn = (backsql_db_conn *)v_conn;
+
+ Debug( LDAP_DEBUG_TRACE, "==>backsql_close_db_conn(%lu)\n",
+ conn->ldap_cid, 0, 0 );
/*
* Default transact is SQL_ROLLBACK; commit is required only
@@ -263,18 +271,30 @@ backsql_close_db_conn( backsql_db_conn *conn )
SQLTransact( SQL_NULL_HENV, conn->dbh, SQL_ROLLBACK );
SQLDisconnect( conn->dbh );
SQLFreeConnect( conn->dbh );
- Debug( LDAP_DEBUG_TRACE, "<==backsql_close_db_conn()\n", 0, 0, 0 );
- return 1;
+ ch_free( conn );
+
+ Debug( LDAP_DEBUG_TRACE, "<==backsql_close_db_conn(%lu)\n",
+ conn->ldap_cid, 0, 0 );
}
int
-backsql_init_db_env( backsql_info *si )
+backsql_conn_destroy(
+ backsql_info *bi )
+{
+ avl_free( bi->sql_db_conns, backsql_close_db_conn );
+
+ return 0;
+}
+
+int
+backsql_init_db_env( backsql_info *bi )
{
RETCODE rc;
int ret = SQL_SUCCESS;
Debug( LDAP_DEBUG_TRACE, "==>backsql_init_db_env()\n", 0, 0, 0 );
- rc = SQLAllocEnv( &si->db_env );
+
+ rc = SQLAllocEnv( &bi->sql_db_env );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "init_db_env: SQLAllocEnv failed:\n",
0, 0, 0 );
@@ -282,19 +302,19 @@ backsql_init_db_env( backsql_info *si )
SQL_NULL_HENV, rc );
ret = SQL_ERROR;
}
+
Debug( LDAP_DEBUG_TRACE, "<==backsql_init_db_env()=%d\n", ret, 0, 0 );
+
return ret;
}
int
-backsql_free_db_env( backsql_info *si )
+backsql_free_db_env( backsql_info *bi )
{
Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_env()\n", 0, 0, 0 );
-#ifdef BACKSQL_TRACE
- Debug( LDAP_DEBUG_TRACE, "free_db_env(): delete AVL tree here!!!\n",
- 0, 0, 0 );
-#endif /* BACKSQL_TRACE */
+ (void)SQLFreeEnv( bi->sql_db_env );
+ bi->sql_db_env = SQL_NULL_HENV;
/*
* stop, if frontend waits for all threads to shutdown
@@ -302,41 +322,46 @@ backsql_free_db_env( backsql_info *si )
* everything is already deleted...
*/
Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_env()\n", 0, 0, 0 );
+
return SQL_SUCCESS;
}
static int
-backsql_open_db_conn( backsql_info *si, unsigned long ldap_cid, backsql_db_conn **pdbc )
+backsql_open_db_conn( backsql_info *bi, unsigned long ldap_cid, backsql_db_conn **pdbc )
{
/* TimesTen */
char DBMSName[ 32 ];
backsql_db_conn *dbc;
int rc;
- assert( pdbc );
+ assert( pdbc != NULL );
*pdbc = NULL;
- Debug( LDAP_DEBUG_TRACE, "==>backsql_open_db_conn()\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "==>backsql_open_db_conn(%lu)\n",
+ ldap_cid, 0, 0 );
+
dbc = (backsql_db_conn *)ch_calloc( 1, sizeof( backsql_db_conn ) );
dbc->ldap_cid = ldap_cid;
- rc = SQLAllocConnect( si->db_env, &dbc->dbh );
+ rc = SQLAllocConnect( bi->sql_db_env, &dbc->dbh );
if ( !BACKSQL_SUCCESS( rc ) ) {
- Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: "
- "SQLAllocConnect() failed:\n", 0, 0, 0 );
- backsql_PrintErrors( si->db_env, SQL_NULL_HDBC,
+ Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): "
+ "SQLAllocConnect() failed:\n", ldap_cid, 0, 0 );
+ backsql_PrintErrors( bi->sql_db_env, SQL_NULL_HDBC,
SQL_NULL_HENV, rc );
return LDAP_UNAVAILABLE;
}
- rc = SQLConnect( dbc->dbh, si->dbname, SQL_NTS, si->dbuser,
- SQL_NTS, si->dbpasswd, SQL_NTS );
+ rc = SQLConnect( dbc->dbh,
+ (SQLCHAR*)bi->sql_dbname, SQL_NTS,
+ (SQLCHAR*)bi->sql_dbuser, SQL_NTS,
+ (SQLCHAR*)bi->sql_dbpasswd, SQL_NTS );
if ( rc != SQL_SUCCESS ) {
- Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: "
- "SQLConnect() to database \"%s\" as user \"%s\" "
- "%s:\n", si->dbname, si->dbuser,
+ Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): "
+ "SQLConnect() to database \"%s\" %s.\n",
+ ldap_cid, bi->sql_dbname,
rc == SQL_SUCCESS_WITH_INFO ?
"succeeded with info" : "failed" );
- backsql_PrintErrors( si->db_env, dbc->dbh, SQL_NULL_HENV, rc );
+ backsql_PrintErrors( bi->sql_db_env, dbc->dbh, SQL_NULL_HENV, rc );
if ( rc != SQL_SUCCESS_WITH_INFO ) {
return LDAP_UNAVAILABLE;
}
@@ -353,35 +378,35 @@ backsql_open_db_conn( backsql_info *si, unsigned long ldap_cid, backsql_db_conn
* remember that fact for later use.
*/
/* Assume until proven otherwise */
- si->bsql_flags &= ~BSQLF_USE_REVERSE_DN;
+ bi->sql_flags &= ~BSQLF_USE_REVERSE_DN;
DBMSName[ 0 ] = '\0';
rc = SQLGetInfo( dbc->dbh, SQL_DBMS_NAME, (PTR)&DBMSName,
sizeof( DBMSName ), NULL );
if ( rc == SQL_SUCCESS ) {
if ( strcmp( DBMSName, "TimesTen" ) == 0 ||
strcmp( DBMSName, "Front-Tier" ) == 0 ) {
- Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: "
- "TimesTen database!\n", 0, 0, 0 );
- si->bsql_flags |= BSQLF_USE_REVERSE_DN;
+ Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): "
+ "TimesTen database!\n", ldap_cid, 0, 0 );
+ bi->sql_flags |= BSQLF_USE_REVERSE_DN;
}
} else {
- Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: "
- "SQLGetInfo() failed:\n", 0, 0, 0 );
- backsql_PrintErrors( si->db_env, dbc->dbh, SQL_NULL_HENV, rc );
+ Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): "
+ "SQLGetInfo() failed.\n", ldap_cid, 0, 0 );
+ backsql_PrintErrors( bi->sql_db_env, dbc->dbh, SQL_NULL_HENV, rc );
return rc;
}
/* end TimesTen */
- Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(): "
- "connected, adding to tree\n", 0, 0, 0 );
- ldap_pvt_thread_mutex_lock( &si->dbconn_mutex );
- if ( avl_insert( &si->db_conns, dbc, backsql_cmp_connid, avl_dup_error ) ) {
- Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: "
- "duplicate connection ID\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): "
+ "connected, adding to tree.\n", ldap_cid, 0, 0 );
+ ldap_pvt_thread_mutex_lock( &bi->sql_dbconn_mutex );
+ if ( avl_insert( &bi->sql_db_conns, dbc, backsql_cmp_connid, avl_dup_error ) ) {
+ Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): "
+ "duplicate connection ID.\n", ldap_cid, 0, 0 );
return LDAP_OTHER;
}
- ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex );
- Debug( LDAP_DEBUG_TRACE, "<==backsql_open_db_conn()\n", 0, 0, 0 );
+ ldap_pvt_thread_mutex_unlock( &bi->sql_dbconn_mutex );
+ Debug( LDAP_DEBUG_TRACE, "<==backsql_open_db_conn(%lu)\n", ldap_cid, 0, 0 );
*pdbc = dbc;
@@ -391,15 +416,15 @@ backsql_open_db_conn( backsql_info *si, unsigned long ldap_cid, backsql_db_conn
int
backsql_free_db_conn( Operation *op )
{
- backsql_info *si = (backsql_info *)op->o_bd->be_private;
+ backsql_info *bi = (backsql_info *)op->o_bd->be_private;
backsql_db_conn tmp = { 0 },
*conn;
Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_conn()\n", 0, 0, 0 );
tmp.ldap_cid = op->o_connid;
- ldap_pvt_thread_mutex_lock( &si->dbconn_mutex );
- conn = avl_delete( &si->db_conns, &tmp, backsql_cmp_connid );
- ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex );
+ ldap_pvt_thread_mutex_lock( &bi->sql_dbconn_mutex );
+ conn = avl_delete( &bi->sql_db_conns, &tmp, backsql_cmp_connid );
+ ldap_pvt_thread_mutex_unlock( &bi->sql_dbconn_mutex );
/*
* we have one thread per connection, as I understand -- so we can
@@ -407,24 +432,27 @@ backsql_free_db_conn( Operation *op )
*/
if ( conn != NULL ) {
Debug( LDAP_DEBUG_TRACE, "backsql_free_db_conn(): "
- "closing db connection\n", 0, 0, 0 );
- backsql_close_db_conn( conn );
+ "closing db connection %lu (%p)\n",
+ op->o_connid, conn, 0 );
+ backsql_close_db_conn( (void *)conn );
}
+
Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_conn()\n", 0, 0, 0 );
- return SQL_SUCCESS;
+
+ return conn ? SQL_SUCCESS : SQL_ERROR;
}
int
backsql_get_db_conn( Operation *op, SQLHDBC *dbh )
{
- backsql_info *si = (backsql_info *)op->o_bd->be_private;
+ backsql_info *bi = (backsql_info *)op->o_bd->be_private;
backsql_db_conn *dbc,
tmp = { 0 };
int rc = LDAP_SUCCESS;
Debug( LDAP_DEBUG_TRACE, "==>backsql_get_db_conn()\n", 0, 0, 0 );
- assert( dbh );
+ assert( dbh != NULL );
*dbh = SQL_NULL_HDBC;
tmp.ldap_cid = op->o_connid;
@@ -433,9 +461,9 @@ backsql_get_db_conn( Operation *op, SQLHDBC *dbh )
* we have one thread per connection, as I understand --
* so we do not need locking here
*/
- dbc = avl_find( si->db_conns, &tmp, backsql_cmp_connid );
+ dbc = avl_find( bi->sql_db_conns, &tmp, backsql_cmp_connid );
if ( !dbc ) {
- rc = backsql_open_db_conn( si, op->o_connid, &dbc );
+ rc = backsql_open_db_conn( bi, op->o_connid, &dbc );
if ( rc != LDAP_SUCCESS) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_db_conn(): "
"could not get connection handle "
@@ -444,18 +472,18 @@ backsql_get_db_conn( Operation *op, SQLHDBC *dbh )
}
}
- ldap_pvt_thread_mutex_lock( &si->schema_mutex );
- if ( !BACKSQL_SCHEMA_LOADED( si ) ) {
+ ldap_pvt_thread_mutex_lock( &bi->sql_schema_mutex );
+ if ( !BACKSQL_SCHEMA_LOADED( bi ) ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_db_conn(): "
"first call -- reading schema map\n", 0, 0, 0 );
- rc = backsql_load_schema_map( si, dbc->dbh );
+ rc = backsql_load_schema_map( bi, dbc->dbh );
if ( rc != LDAP_SUCCESS ) {
- ldap_pvt_thread_mutex_unlock( &si->schema_mutex );
+ ldap_pvt_thread_mutex_unlock( &bi->sql_schema_mutex );
backsql_free_db_conn( op );
return rc;
}
}
- ldap_pvt_thread_mutex_unlock( &si->schema_mutex );
+ ldap_pvt_thread_mutex_unlock( &bi->sql_schema_mutex );
*dbh = dbc->dbh;
@@ -464,5 +492,3 @@ backsql_get_db_conn( Operation *op, SQLHDBC *dbh )
return LDAP_SUCCESS;
}
-#endif /* SLAPD_SQL */
-