struct berval bdb_uuid = { 0, NULL };
+typedef void * db_malloc(size_t);
+typedef void * db_realloc(void *, size_t);
+
static int
bdb_open( BackendInfo *bi )
{
int rc, i;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
u_int32_t flags;
+#ifdef HAVE_EBCDIC
+ char path[MAXPATHLEN];
+#endif
#ifdef NEW_LOGGING
LDAP_LOG( BACK_BDB, ARGS,
be->be_suffix[0].bv_val, 0, 0 );
#endif
+ db_env_set_func_free( ber_memfree );
+ db_env_set_func_malloc( ber_memalloc );
+ db_env_set_func_realloc( ber_memrealloc );
+
/* we should check existance of dbenv_home and db_directory */
rc = db_env_create( &bdb->bi_dbenv, 0 );
flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE
| DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN;
- /* Only slapd will do recovery, slap-tools won't. Otherwise
- * running slapcat while slapd is active corrupts the db.
+#if 0
+ /* Never do automatic recovery, must perform it manually.
+ * Otherwise restarting with gentlehup will corrupt the
+ * database.
*/
if( !(slapMode & SLAP_TOOL_MODE) ) flags |= DB_RECOVER;
+#endif
bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
bdb->bi_dbenv_home, 0, 0);
#endif
+#ifdef HAVE_EBCDIC
+ strcpy( path, bdb->bi_dbenv_home );
+ __atoe( path );
+ rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
+ path,
+ flags,
+ bdb->bi_dbenv_mode );
+#else
rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
bdb->bi_dbenv_home,
flags,
bdb->bi_dbenv_mode );
+#endif
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( BACK_BDB, ERR,
#ifdef BDB_HIER
rc = db->bdi_db->set_bt_compare( db->bdi_db,
bdb_bt_compare );
-#elif defined(BDB_IDL_MULTI)
+#else
rc = db->bdi_db->set_flags( db->bdi_db,
DB_DUP | DB_DUPSORT );
rc = db->bdi_db->set_dup_compare( db->bdi_db,
BDB_PAGESIZE );
}
- rc = db->bdi_db->open( db->bdi_db,
+#ifdef HAVE_EBCDIC
+ strcpy( path, bdbi_databases[i].file );
+ __atoe( path );
+ rc = DB_OPEN( db->bdi_db,
+ path,
+ /* bdbi_databases[i].name, */ NULL,
+ bdbi_databases[i].type,
+ bdbi_databases[i].flags | flags,
+ bdb->bi_dbenv_mode );
+#else
+ rc = DB_OPEN( db->bdi_db,
bdbi_databases[i].file,
/* bdbi_databases[i].name, */ NULL,
bdbi_databases[i].type,
bdbi_databases[i].flags | flags,
bdb->bi_dbenv_mode );
+#endif
if( rc != 0 ) {
#ifdef NEW_LOGGING
}
}
+ if( bdb->bi_dbenv_home ) ch_free( bdb->bi_dbenv_home );
+
#ifdef BDB_HIER
ldap_pvt_thread_rdwr_destroy( &bdb->bi_tree_rdwr );
#endif
ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_mutex );
ldap_pvt_thread_mutex_destroy( &bdb->bi_database_mutex );
+ ch_free( bdb );
+ be->be_private = NULL;
+
return 0;
}
#endif
#ifdef LDAP_CONTROL_VALUESRETURNFILTER
LDAP_CONTROL_VALUESRETURNFILTER,
+#endif
+#ifdef LDAP_CLIENT_UPDATE
+ LDAP_CONTROL_CLIENT_UPDATE,
#endif
NULL
};
{ /* version check */
int major, minor, patch;
char *version = db_version( &major, &minor, &patch );
+#ifdef HAVE_EBCDIC
+ char v2[1024];
+
+ /* All our stdio does an ASCII to EBCDIC conversion on
+ * the output. Strings from the BDB library are already
+ * in EBCDIC; we have to go back and forth...
+ */
+ strcpy( v2, version );
+ __etoa( v2 );
+ version = v2;
+#endif
if( major != DB_VERSION_MAJOR ||
minor != DB_VERSION_MINOR ||
db_env_set_func_yield( ldap_pvt_thread_yield );
{
- static char uuidbuf[40];
+ static char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
bdb_uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ));
bdb_uuid.bv_val = uuidbuf;