remove unused structure member ps_id

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

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index d60c337750ba2d2bd1094facfd11980d85689686..8840f35ad185d6766ac4c27ac76f91cd3dc0af9a 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -901,7 +901,6 @@ static int parsePagedResults (
        } else {
                /* Initial request.  Initialize state. */
                op->o_pagedresults_state.ps_cookie = 0;
-               op->o_pagedresults_state.ps_id = NOID;
                op->o_pagedresults_state.ps_count = 0;
        }
 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index b580224958f1982c72a73148befaf788ebdeb3ff..2203393f0a74c69f0539cc9ea591d212f73530a4 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1893,7 +1893,6 @@ typedef unsigned long PagedResultsCookie;
 typedef struct slap_paged_state {
        Backend *ps_be;
        PagedResultsCookie ps_cookie;
-       ID ps_id;
        int ps_count;
 } PagedResultsState;