From cdd7112624dd87d3e371f332b46f05fa179d8ac8 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 25 Jan 2006 19:18:31 +0000 Subject: [PATCH] Update ITS#4361 fix --- CHANGES | 2 +- servers/slapd/back-bdb/init.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index f43b48fbd0..af7def7538 100644 --- a/CHANGES +++ b/CHANGES @@ -5,7 +5,7 @@ OpenLDAP 2.3.19 Release Fixed libldap_r thread pool destroy hang (ITS#4349,ITS#4368) Fixed slapd slap_daemon destroy issue (ITS#4370) Fixed slapd-hdb livelock issue (ITS#4360) - Fixed slapd-bdb/hdb auto-recovery issue (ITS#4361) + Fixed slapd-bdb/hdb auto-recovery issue (ITS#4361,ITS#4373) Fixed slapd-bdb/hdb BDB 4.4 compatibility issues (ITS#4362) Fixed slapo-ppolicy modify issue (ITS#4355) Fixed slapo-syncprov/pache filter dup issue (ITS#4364) diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index 4c41aa1d56..da7b438f6e 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -219,6 +219,14 @@ bdb_db_open( BackendDB *be ) goto fail; } +#ifdef HAVE_EBCDIC + strcpy( path, bdb->bi_dbenv_home ); + __atoe( path ); + dbhome = path; +#else + dbhome = bdb->bi_dbenv_home; +#endif + /* If existing environment is clean but doesn't support * currently requested modes, remove it. */ @@ -261,14 +269,6 @@ bdb_db_open( BackendDB *be ) #define BDB_TXN_FLAGS (DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN) -#ifdef HAVE_EBCDIC - strcpy( path, bdb->bi_dbenv_home ); - __atoe( path ); - dbhome = path; -#else - dbhome = bdb->bi_dbenv_home; -#endif - Debug( LDAP_DEBUG_TRACE, "bdb_db_open: dbenv_open(%s)\n", bdb->bi_dbenv_home, 0, 0); -- 2.39.5