From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 26 Jan 1999 05:29:12 +0000 (+0000)
Subject: import slapd/ldbm/add set cache state bugfix from devel.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cbccfa36a8b6247e6392f039f92c7c05b872104;p=thirdparty%2Fopenldap.git

import slapd/ldbm/add set cache state bugfix from devel.
---

diff --git a/CHANGES b/CHANGES
index 3b942d9faf..08470eebb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 OpenLDAP Change Log
 
+Changes included in OpenLDAP 1.1.5
+	CVS Tag: OPENLDAP_REL_ENG_1_1
+	Fixed slapd/ldbm/add cache set state deadlock bug
+
 Changes included in OpenLDAP 1.1.4
 	CVS Tag: OPENLDAP_REL_ENG_1_1_4
 	Updated docs
diff --git a/build/version b/build/version
index 6b351d95b8..03cdb45e8d 100644
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.1.4-Release
+1.1.5-Engineering
diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index 713372f24d..421c53be05 100644
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -231,8 +231,6 @@ return_results:;
 	if ( dn != NULL )
 		free( dn );
 
-	cache_set_state( &li->li_cache, e, 0 );
-
 	if (p != NULL) {
 		/* free parent and writer lock */
 		cache_return_entry_w( &li->li_cache, p ); 
@@ -243,6 +241,8 @@ return_results:;
 		pthread_mutex_unlock(&li->li_root_mutex);
 	}
 
+	cache_set_state( &li->li_cache, e, 0 );
+
 	/* free entry and writer lock */
 	cache_return_entry_w( &li->li_cache, e );