ITS#3559 - import fix from HEAD

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 91ab7f0ea852349e171dd39d37d4616ab1627cda..8f90b8ad6873bf7113e6464d9a2fff0c02c540d1 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -930,15 +930,6 @@ hdb_dn2idl_internal(
        struct dn2id_cookie *cx
 )
 {
-       if ( cx->bdb->bi_idl_cache_size ) {
-               cx->rc = bdb_idl_cache_get(cx->bdb, cx->db, &cx->key, cx->tmp);
-               if ( cx->rc == DB_NOTFOUND ) {
-                       return cx->rc;
-               }
-               if ( cx->rc == LDAP_SUCCESS ) {
-                       goto gotit;
-               }
-       }
        BDB_IDL_ZERO( cx->tmp );
 
        if ( !cx->ei ) {
@@ -949,6 +940,16 @@ hdb_dn2idl_internal(
                }
        }
 
+       if ( cx->bdb->bi_idl_cache_size ) {
+               cx->rc = bdb_idl_cache_get(cx->bdb, cx->db, &cx->key, cx->tmp);
+               if ( cx->rc == DB_NOTFOUND ) {
+                       return cx->rc;
+               }
+               if ( cx->rc == LDAP_SUCCESS ) {
+                       goto gotit;
+               }
+       }
+
        bdb_cache_entryinfo_lock( cx->ei );
 
        /* If number of kids in the cache differs from on-disk, load