ITS#3559 - import fix from HEAD

This commit is contained in:
Howard Chu 2005-03-14 19:04:05 +00:00
parent dc2baf4097
commit 3f5cd9ed1f

View File

@ -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