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

diff --git a/CHANGES b/CHANGES
index 3b942d9fafa0e7bd9c272f8daa4ac42bf746ee53..08470eebb4feae7aa617dcdbf9cc838909189969 100644 (file)
--- 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 6b351d95b8d7d26e7f97120fc819ca2d3a8dd428..03cdb45e8d98cc4adbd7545d3f587bb3d99af9a2 100644 (file)
--- 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 713372f24d5486b76c3cc45d57a75d541553c40b..421c53be05da9f0a79a0bf91a1fc09cedb87015d 100644 (file)
--- 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 );