Update CHANGES in preparation for release.

diff --git a/CHANGES b/CHANGES
index a599e72740637a8692a4026e7d4375b36da7e5ef..21fda118fdfd3df1e3281e5f1c40a35134579e9d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,17 @@
 OpenLDAP Change Log
 
+Changes included in OpenLDAP 1.2 Release Engineering
+       CVS Tag: OPENLDAP_REL_ENG_1_2_1
+       Fixed ud cp == NULL bug
+       Fixed ldbm Berkeley DB 2.4 mp_pool init problem
+       Fixed slapd modrdn
+       Fixed slapd command line usage and log level option
+       Fixed slurpd ldap_pvt_thread_create argument typo
+       Added modrdn test.
+       Build environment
+               Mixed 'make veryclean' doc directory problem
+               Fixed <ac/string.h> strdup declaration issues
+
 Changes included in OpenLDAP 1.2.1
        CVS Tag: OPENLDAP_REL_ENG_1_2_1
        Updated ctype and string generic headers

diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index 2dd71f683113e99c8d6537959be5fe89792d196a..a953dd4af2179f44aaff69a09e3fce88f3665c7e 100644 (file)
--- a/libraries/libldbm/ldbm.c
+++ b/libraries/libldbm/ldbm.c
@@ -142,11 +142,16 @@ ldbm_open( char *name, int rw, int mode, int dbcachesize )
        dbinfo.db_pagesize  = DEFAULT_DB_PAGE_SIZE;
        dbinfo.db_malloc    = ldbm_malloc;
 
+#if defined( DB_VERSION_MAJOR ) && defined( DB_VERSION_MINOR ) \
+       && DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR != 4
+
        if( ldbm_Env.mp_info == NULL ) {
                /* set a cachesize if we aren't using a memory pool */
                dbinfo.db_cachesize = dbcachesize;
        }
 
+#endif
+
        LDBM_LOCK;
     (void) db_open( name, DB_TYPE, rw, mode, &ldbm_Env, &dbinfo, &ret );
        LDBM_UNLOCK;