From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 23 Jun 2010 17:57:26 +0000 (+0000)
Subject: ITS#6577
X-Git-Tag: OPENLDAP_REL_ENG_2_4_23~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b4ab65407a4239b9100a61eaa86d70d41f456ecb;p=openldap

ITS#6577
---

diff --git a/CHANGES b/CHANGES
index 2a91c790da..501aa4fe79 100644
--- 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 6e89e61db5..0ea30714ae 100644
--- 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