Fix: if slapadd was used with an un-ordered LDIF file, we can't rely on

entries having ascending entry IDs. Always start from the beginning of
the candidate list. (This should be fine in the general case as well,
since the subtree index will also have refined the candidates.)

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index d9fadde8290872cc2df52c9b801d1924c0efa3ec..0810625ada18c3764545946b665623d3b406c5dc 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -295,11 +295,9 @@ dn2entry_retry:
        /* need normalized dn below */
        ber_dupbv( &realbase, &e->e_nname );
 
-       /* start cursor at base entry's id 
-        * FIXME: hack to make "" base work
-        * FIXME: moddn needs to assign new ID for this to work
+       /* start cursor at beginning of candidates.
         */
-       cursor = e->e_id == NOID ? 1 : e->e_id;
+       cursor = 0;
 
        if ( e != &slap_entry_root ) {
                bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);