X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-bdb%2Fdelete.c;h=2d5302e64ca666520a2bd26d07eaba7b757adce0;hb=2b6f4ff7d0162bd496dba45e20e1eb1e3bf67ec9;hp=cd4274d5c8fd497ba6e9e9db490b42fbfe228fa2;hpb=d290145776d05eacf6e74dff535eb201cdd59287;p=openldap

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index cd4274d5c8..2d5302e64c 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -124,7 +124,7 @@ retry:	/* transaction retry */
 	if ( rs->sr_err == 0 ) {
 		e = ei->bei_e;
 		eip = ei->bei_parent;
-		bdb_cache_find_entry_id( op->o_bd, ltid, eip->bei_id, &eip,
+		bdb_cache_find_id( op->o_bd, ltid, eip->bei_id, &eip,
 			0, locker, &plock, op->o_tmpmemctx );
 	}
 	if ( eip ) {
@@ -323,7 +323,7 @@ retry:	/* transaction retry */
 	}
 
 	/* Can't do it if we have kids */
-	rs->sr_err = bdb_dn2id_children( op, lt2, e );
+	rs->sr_err = bdb_cache_children( op, lt2, e );
 	if( rs->sr_err != DB_NOTFOUND ) {
 		switch( rs->sr_err ) {
 		case DB_LOCK_DEADLOCK:
@@ -358,7 +358,7 @@ retry:	/* transaction retry */
 	}
 
 	/* delete from dn2id */
-	rs->sr_err = bdb_dn2id_delete( op->o_bd, lt2, pdn.bv_val, e,
+	rs->sr_err = bdb_dn2id_delete( op->o_bd, lt2, eip, e,
 		op->o_tmpmemctx );
 	if ( rs->sr_err != 0 ) {
 		switch( rs->sr_err ) {
@@ -442,7 +442,7 @@ retry:	/* transaction retry */
 			rs->sr_err = LDAP_SUCCESS;
 		}
 	} else {
-		bdb_cache_delete_entry( &bdb->bi_cache, e, bdb->bi_dbenv,
+		bdb_cache_delete( &bdb->bi_cache, e, bdb->bi_dbenv,
 			locker, &lock );
 		rs->sr_err = TXN_COMMIT( ltid, 0 );
 	}