From 35bd609e16fc372ab91a45263a1f54685326bc5d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 22 Nov 1998 22:21:52 +0000 Subject: [PATCH] Apply back-ldbm delete id bugfix from -devel. --- servers/slapd/back-ldbm/delete.c | 2 ++ servers/slapd/back-ldbm/id2children.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c index 32317c922f..7e0008ba80 100644 --- a/servers/slapd/back-ldbm/delete.c +++ b/servers/slapd/back-ldbm/delete.c @@ -93,6 +93,8 @@ ldbm_back_delete( /* free entry and writer lock */ cache_return_entry_w( &li->li_cache, e ); + if ( p ) + cache_return_entry_r( &li->li_cache, p ); send_ldap_result( conn, op, LDAP_SUCCESS, "", "" ); diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c index cd0cc7a6df..23e64f7559 100644 --- a/servers/slapd/back-ldbm/id2children.c +++ b/servers/slapd/back-ldbm/id2children.c @@ -77,7 +77,7 @@ id2children_remove( if ( (db = ldbm_cache_open( be, "id2children", LDBM_SUFFIX, LDBM_WRCREAT )) == NULL ) { Debug( LDAP_DEBUG_ANY, - "<= id2children_add -1 could not open \"id2children%s\"\n", + "<= id2children_remove -1 could not open \"id2children%s\"\n", LDBM_SUFFIX, 0, 0 ); return( -1 ); } @@ -88,7 +88,7 @@ id2children_remove( key.dsize = strlen( buf ) + 1; if ( idl_delete_key( be, db, key, e->e_id ) != 0 ) { - Debug( LDAP_DEBUG_TRACE, "<= id2children_add -1 (idl_insert)\n", + Debug( LDAP_DEBUG_TRACE, "<= id2children_remove -1 (idl_insert)\n", 0, 0, 0 ); ldbm_cache_close( be, db ); return( -1 ); @@ -96,7 +96,7 @@ id2children_remove( ldbm_cache_close( be, db ); - Debug( LDAP_DEBUG_TRACE, "<= id2children_add 0\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "<= id2children_remove 0\n", 0, 0, 0 ); return( 0 ); } -- 2.39.5