ITS#6577

diff --git a/CHANGES b/CHANGES
index 2a91c790da4b55b62c699e20db5c166bda578119..501aa4fe798a2f0f9f261b8df4c098cc21173bd3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ OpenLDAP 2.4.23 Engineering
        Fixed slapd modrdn handling of invalid values (ITS#6570)
        Fixed slapd-bdb hasSubordinates computation (ITS#6549)
        Fixed slapd-bdb to use memcpy instead for strcpy (ITS#6474)
+       Fixed slapd-bdb entry cache delete failure (ITS#6577)
        Fixed slapd-ldap to return control responses (ITS#6530)
        Fixed slapo-ppolicy to use Debug (ITS#6566)
        Fixed slapo-refint to zero out freed DN vals (ITS#6572)

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 6e89e61db5c86f53880999c08c004102478f2f8c..0ea30714ae62ab0c6d8c71c7400a7e64a93a3292 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -23,7 +23,6 @@
 #include "idl.h"
 #include "lutil.h"
 
-#if 0
 #define bdb_dn2id_lock                                 BDB_SYMBOL(dn2id_lock)
 
 static int
@@ -49,9 +48,6 @@ bdb_dn2id_lock( struct bdb_info *bdb, struct berval *dn,
                                        &lockobj, db_rw, lock);
        return rc;
 }
-#else
-#define        bdb_dn2id_lock(a,b,c,d,e)       0
-#endif
 
 #ifndef BDB_HIER
 int