From 38ccdaf7a30b93d1fe6ad605614679f35444aba8 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 8 Dec 2003 18:16:07 +0000
Subject: [PATCH] unifdef -DLDAP_CONTROL_PAGEDRESULTS (as it is always defined)

---
 servers/slapd/back-bdb/init.c   | 2 --
 servers/slapd/back-bdb/search.c | 6 ------
 servers/slapd/connection.c      | 3 ---
 servers/slapd/controls.c        | 4 ----
 servers/slapd/slap.h            | 4 ----
 5 files changed, 19 deletions(-)

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 7d225dab6a..978fd5f0c4 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -590,9 +590,7 @@ bdb_initialize(
 		LDAP_CONTROL_ASSERT,
 		LDAP_CONTROL_MANAGEDSAIT,
 		LDAP_CONTROL_NOOP,
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 		LDAP_CONTROL_PAGEDRESULTS,
-#endif
 #ifdef LDAP_CONTROL_SUBENTRIES
 		LDAP_CONTROL_SUBENTRIES,
 #endif
diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 701b04918d..c0f9d4ac42 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -812,7 +812,6 @@ dn2entry_retry:
 		tentries = BDB_IDL_N(candidates);
 	}
 
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 	if ( get_pagedresults(sop) ) {
 		if ( sop->o_pagedresults_state.ps_cookie == 0 ) {
 			id = 0;
@@ -844,7 +843,6 @@ dn2entry_retry:
 		}
 		goto loop_begin;
 	}
-#endif
 
 	if ( (sop->o_sync_mode & SLAP_SYNC_REFRESH) || IS_PSEARCH )
 	{
@@ -1184,7 +1182,6 @@ id2entry_retry:
 				goto done;
 			}
 
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 			if ( get_pagedresults(sop) ) {
 				if ( rs->sr_nentries >= sop->o_pagedresults_size ) {
 					send_pagerequest_response( sop, rs,
@@ -1193,7 +1190,6 @@ id2entry_retry:
 				}
 				lastid = id;
 			}
-#endif
 
 			if (e) {
 				/* safe default */
@@ -1737,7 +1733,6 @@ static int search_candidates(
 	return rc;
 }
 
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 static void
 send_pagerequest_response( 
 	Operation	*op,
@@ -1792,4 +1787,3 @@ send_pagerequest_response(
 done:
 	(void) ber_free_buf( ber );
 }			
-#endif
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 9ee80e6d86..b0f1c8f3d0 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1567,10 +1567,7 @@ connection_input(
 	op->o_preread_attrs = NULL;
 	op->o_postread_attrs = NULL;
 	op->o_vrFilter = NULL;
-
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 	op->o_pagedresults_state = conn->c_pagedresults_state;
-#endif
 
 	op->o_res_ber = NULL;
 
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index c5aca28721..8177fa38ea 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -89,11 +89,9 @@ static struct slap_control control_defs[] = {
  	{ LDAP_CONTROL_VALUESRETURNFILTER,
  		SLAP_CTRL_SEARCH, NULL,
 		parseValuesReturnFilter, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 	{ LDAP_CONTROL_PAGEDRESULTS,
 		SLAP_CTRL_SEARCH, NULL,
 		parsePagedResults, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-#endif
 #ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
 	{ LDAP_CONTROL_X_DOMAIN_SCOPE,
 		SLAP_CTRL_FRONTEND|SLAP_CTRL_SEARCH, NULL,
@@ -819,7 +817,6 @@ static int parseNoOp (
 	return LDAP_SUCCESS;
 }
 
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 static int parsePagedResults (
 	Operation *op,
 	SlapReply *rs,
@@ -900,7 +897,6 @@ static int parsePagedResults (
 
 	return LDAP_SUCCESS;
 }
-#endif
 
 static int parseAssert (
 	Operation *op,
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 40e87db905..d67b3ee8d2 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2009,14 +2009,10 @@ typedef struct slap_op {
 	AttributeName *o_preread_attrs;
 	AttributeName *o_postread_attrs;
 
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 	char o_pagedresults;
 #define get_pagedresults(op)			((int)(op)->o_pagedresults)
 	ber_int_t o_pagedresults_size;
 	PagedResultsState o_pagedresults_state;
-#else
-#define get_pagedresults(op)			(0)
-#endif
 
 	char o_sync;
 	char o_sync_mode;
-- 
2.39.5