Update ITS#4361 fix

diff --git a/CHANGES b/CHANGES
index f43b48fbd00f5fe81ccd033b6e1b22c9f80eb19b..af7def75384dd384a3da7b6b39572590734d397a 100644 (file)
--- 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 4c41aa1d56d9c1f6b6bccd36b13fc42cde7c36c9..da7b438f6efafe87eaef8fe986e608230232a147 100644 (file)
--- 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);