ITS#5455

diff --git a/CHANGES b/CHANGES
index 920baf57e16b579e95c3e0b3999544489f25576e..4b335bf8d535746863310dae34384d50df33611a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ OpenLDAP 2.4.9 Engineering
        Fixed slapd value list termination (ITS#5450)
        Fixed slapd/slapo-accesslog rq mutex usage (ITS#5442)
        Fixed slapd-bdb ID_NOCACHE handling (ITS#5439)
+       Fixed slapd-bdb entryinfo state if db_lock fails (ITS#5455)
        Fixed slapd-ldap connection handler (ITS#5404)
        Fixed slapo-auditlog unnecessary syscall (ITS#5441)
        Fixed slapo-refint dnSubtreeMatch (ITS#5427)

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index ff512977bc40d83fce6371cc3a793c3a6c854164..065c6d25cb24e264361eb0427afaeb3be66e8ca5 100644 (file)
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -964,12 +964,12 @@ load1:
                                        }
 #endif
                                }
-                               bdb_cache_entryinfo_lock( *eip );
-                               (*eip)->bei_finders--;
-                               if ( load )
-                                       (*eip)->bei_state ^= CACHE_ENTRY_LOADING;
-                               bdb_cache_entryinfo_unlock( *eip );
                        }
+                       bdb_cache_entryinfo_lock( *eip );
+                       (*eip)->bei_finders--;
+                       if ( load )
+                               (*eip)->bei_state ^= CACHE_ENTRY_LOADING;
+                       bdb_cache_entryinfo_unlock( *eip );
                }
        }
        if ( flag & ID_LOCKED ) {