mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do version checks for BDB 3 or greater

Browse Source
This commit is contained in:
Kurt Zeilenga 2001-09-03 19:23:05 +00:00
parent 2f62c3722a
commit 65686b72fd
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libraries/libldbm/ldbm.c
View File

@ -102,8 +102,6 @@ ldbm_db_errcall( const char *prefix, char *message )
#endif #endif
} }
#if DB_VERSION_MAJOR < 3
int ldbm_initialize( const char* home ) int ldbm_initialize( const char* home )
{ {
int err; int err;
@ -134,6 +132,7 @@ int ldbm_initialize( const char* home )
} }
} }
#if DB_VERSION_MAJOR < 3
#ifndef HAVE_BERKELEY_DB_THREAD #ifndef HAVE_BERKELEY_DB_THREAD
ldap_pvt_thread_mutex_init( &ldbm_big_mutex ); ldap_pvt_thread_mutex_init( &ldbm_big_mutex );
#endif #endif
@ -174,6 +173,7 @@ int ldbm_initialize( const char* home )
#endif #endif
return( 1 ); return( 1 );
} }
#endif
return 0; return 0;
} }
@ -182,34 +182,16 @@ int ldbm_shutdown( void )
{ {
if( !ldbm_initialized ) return 1; if( !ldbm_initialized ) return 1;
#if DB_VERSION_MAJOR < 3
db_appexit( ldbm_Env ); db_appexit( ldbm_Env );
#ifndef HAVE_BERKELEY_DB_THREAD #ifndef HAVE_BERKELEY_DB_THREAD
ldap_pvt_thread_mutex_destroy( &ldbm_big_mutex ); 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 #endif
return 0;
}
#else /* some DB other than Berkeley V2 or greater */ #else /* some DB other than Berkeley V2 or greater */
@ -236,7 +218,6 @@ int ldbm_shutdown( void )
#if defined( HAVE_BERKELEY_DB ) && (DB_VERSION_MAJOR >= 3) #if defined( HAVE_BERKELEY_DB ) && (DB_VERSION_MAJOR >= 3)
DB_ENV *ldbm_initialize_env(const char *home, int dbcachesize, int *envdirok) DB_ENV *ldbm_initialize_env(const char *home, int dbcachesize, int *envdirok)
{ {
DB_ENV *env = NULL; DB_ENV *env = NULL;
@ -315,7 +296,6 @@ void ldbm_shutdown_env(DB_ENV *env)
{ {
} }
#endif #endif