Fix DN freeing in BDB_HIER case. (BDB_HIER is still broken, seems to have

a bad interaction with the entry cache.)

diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index b7789a647c971cc194d0ec12578fee8d69477539..10ec1637a58aacd6baff8e40cd27354fbedacbc0 100644 (file)
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -193,6 +193,7 @@ int bdb_entry_return(
                attrs_free( e->e_attrs );
        }
 
+#ifndef BDB_HIER
        /* See if the DNs were changed by modrdn */
        if( e->e_nname.bv_val < e->e_bv.bv_val || e->e_nname.bv_val >
                e->e_bv.bv_val + e->e_bv.bv_len ) {
@@ -201,7 +202,7 @@ int bdb_entry_return(
                e->e_name.bv_val = NULL;
                e->e_nname.bv_val = NULL;
        }
-#ifdef BDB_HIER
+#else
        /* We had to construct the dn and ndn as well, in a single block */
        if( e->e_name.bv_val ) {
                free( e->e_name.bv_val );