ITS#3076: fix back-bdb paged results bug

diff --git a/CHANGES b/CHANGES
index da91ae1c27ecb22f5ff5bbc41c227ff65e494398..31dea507838ddcb41b5b88b9dc59f2219a20f770 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.2.9 Engineering
        Fixed slapd duplicate value detection (ITS#3066)
        Fixed slapd permissive modify control (ITS#3068)
        Fixed slapd updateref handling
+       Fixed back-bdb paged results bug (ITS#3076)
        Fixed back-bdb "" suffix bug (ITS#3063)
        Fixed back-bdb/hdb/ldbm approx w/o index bug (ITS#3062)
        Fixed back-meta compare return code (ITS#3042)

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 170059eaed002f14ff25caba70e1fc4be3458e68..cb060ac5842a3c74efec0fb4cc98a51f3cdfc71b 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -753,7 +753,7 @@ dn2entry_retry:
 
        if ( get_pagedresults(sop) ) {
                if ( sop->o_pagedresults_state.ps_cookie == 0 ) {
-                       id = 0;
+                       id = bdb_idl_first( candidates, &cursor );
 
                } else {
                        if ( sop->o_pagedresults_size == 0 ) {