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

define DB_VERSION_FULL to simplify version checks

Browse Source
This commit is contained in:
Howard Chu 2004-10-16 21:59:58 +00:00
parent 1d0e99858a
commit 84ce549016
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/back-bdb/back-bdb.h
View File

@ -23,6 +23,8 @@
LDAP_BEGIN_DECL LDAP_BEGIN_DECL
#define DB_VERSION_FULL ((DB_VERSION_MAJOR << 24) | (DB_VERSION_MINOR << 16) | DB_VERSION_PATCH)
#define BDB_SUBENTRIES 1 #define BDB_SUBENTRIES 1
#define DN_BASE_PREFIX SLAP_INDEX_EQUALITY_PREFIX #define DN_BASE_PREFIX SLAP_INDEX_EQUALITY_PREFIX
@ -227,7 +229,7 @@ struct bdb_op_info {
#define XLOCK_ID_FREE(env, locker) (env)->lock_id_free(env, locker) #define XLOCK_ID_FREE(env, locker) (env)->lock_id_free(env, locker)
/* BDB 4.1.17 adds txn arg to db->open */ /* BDB 4.1.17 adds txn arg to db->open */
#if DB_VERSION_MINOR > 1 || DB_VERSION_PATCH >= 17 #if DB_VERSION_FULL >= 0x04010011
#undef DB_OPEN #undef DB_OPEN
#define DB_OPEN(db, file, name, type, flags, mode) \ #define DB_OPEN(db, file, name, type, flags, mode) \
(db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode) (db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode)

2
servers/slapd/back-bdb/idl.c
View File

@ -438,7 +438,7 @@ bdb_idl_fetch_key(
* *
* configure now requires Berkeley DB 4.1. * configure now requires Berkeley DB 4.1.
*/ */
#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 0) #if DB_VERSION_FULL < 0x04010000
# define BDB_ENOUGH 5 # define BDB_ENOUGH 5
#else #else
# define BDB_ENOUGH 1 # define BDB_ENOUGH 1

7
servers/slapd/back-bdb/init.c
View File

@ -580,7 +580,7 @@ bdb_initialize(
bi->bi_controls = controls; bi->bi_controls = controls;
{ /* version check */ { /* version check */
int major, minor, patch; int major, minor, patch, ver;
char *version = db_version( &major, &minor, &patch ); char *version = db_version( &major, &minor, &patch );
#ifdef HAVE_EBCDIC #ifdef HAVE_EBCDIC
char v2[1024]; char v2[1024];
@ -594,9 +594,8 @@ bdb_initialize(
version = v2; version = v2;
#endif #endif
if( major != DB_VERSION_MAJOR || ver = (major << 24) | (minor << 16) | patch;
minor != DB_VERSION_MINOR || if( ver < DB_VERSION_FULL )
patch < DB_VERSION_PATCH )
{ {
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"bdb_initialize: BDB library version mismatch:" "bdb_initialize: BDB library version mismatch:"