Fix -USLAPD_RLOOKUPS

[openldap] / servers / slapd / back-ldbm / id2entry.c

diff --git a/servers/slapd/back-ldbm/id2entry.c b/servers/slapd/back-ldbm/id2entry.c
index 783fccc8b2acdebe47d6cb8e5c2a28ed894d994b..d9de7d200b19b8515c924f98f5b3eb70390dc56d 100644 (file)
--- a/servers/slapd/back-ldbm/id2entry.c
+++ b/servers/slapd/back-ldbm/id2entry.c
@@ -18,7 +18,7 @@ int
 id2entry_add( Backend *be, Entry *e )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key, data;
        int             len, rc, flags;
 
@@ -60,7 +60,7 @@ int
 id2entry_delete( Backend *be, Entry *e )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key;
        int             rc;
 
@@ -104,7 +104,7 @@ Entry *
 id2entry_rw( Backend *be, ID id, int rw )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key, data;
        Entry           *e;
 
@@ -145,7 +145,7 @@ id2entry_rw( Backend *be, ID id, int rw )
        ldbm_cache_close( be, db );
 
        if ( e == NULL ) {
-               Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld )  (failed)\n",
+               Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) (failed)\n",
                        rw ? "w" : "r", id, 0 );
                return( NULL );
        }
@@ -160,7 +160,10 @@ id2entry_rw( Backend *be, ID id, int rw )
        if( cache_add_entry_rw( &li->li_cache, e, rw ) != 0 ) {
                entry_free( e );
 
-               /* maybe the entry got added underneath us */
+               /* XXX this is a kludge.
+                * maybe the entry got added underneath us
+                * There are many underlying race condtions in the cache/disk code.
+                */
                if ( (e = cache_find_entry_id( &li->li_cache, id, rw )) != NULL ) {
                        Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (cache)\n",
                                rw ? "w" : "r", id, (unsigned long) e );