Skip to content
Snippets Groups Projects
Commit 65686b72 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Do version checks for BDB 3 or greater

parent 2f62c372
Branches
Tags
No related merge requests found
......@@ -102,8 +102,6 @@ ldbm_db_errcall( const char *prefix, char *message )
#endif
}
#if DB_VERSION_MAJOR < 3
int ldbm_initialize( const char* home )
{
int err;
......@@ -134,6 +132,7 @@ int ldbm_initialize( const char* home )
}
}
#if DB_VERSION_MAJOR < 3
#ifndef HAVE_BERKELEY_DB_THREAD
ldap_pvt_thread_mutex_init( &ldbm_big_mutex );
#endif
......@@ -174,6 +173,7 @@ int ldbm_initialize( const char* home )
#endif
return( 1 );
}
#endif
return 0;
}
......@@ -182,35 +182,17 @@ int ldbm_shutdown( void )
{
if( !ldbm_initialized ) return 1;
#if DB_VERSION_MAJOR < 3
db_appexit( ldbm_Env );
#ifndef HAVE_BERKELEY_DB_THREAD
ldap_pvt_thread_mutex_destroy( &ldbm_big_mutex );
#endif
#endif
return 0;
}
#else /* Berkeley v3 or greater */
int ldbm_initialize( const char * home )
{
/* v3 uses ldbm_initialize_env */
return 0;
}
int ldbm_shutdown( void )
{
return 0;
}
#endif
#else /* some DB other than Berkeley V2 or greater */
int ldbm_initialize( const char * home )
......@@ -236,7 +218,6 @@ int ldbm_shutdown( void )
#if defined( HAVE_BERKELEY_DB ) && (DB_VERSION_MAJOR >= 3)
DB_ENV *ldbm_initialize_env(const char *home, int dbcachesize, int *envdirok)
{
DB_ENV *env = NULL;
......@@ -315,7 +296,6 @@ void ldbm_shutdown_env(DB_ENV *env)
{
}
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment