X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconnection.c;h=04ab269160f24a30f61f8ac1876b05d20b98f838;hb=e2483d8a9bc7fa72bac53d8af3ed215d3a1d80d0;hp=9ee80e6d86c2a8183239daa30e690ebd3600ac56;hpb=74db966ebb5d87a9a17741b536d469bc97c30096;p=openldap

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 9ee80e6d86..04ab269160 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1388,13 +1388,12 @@ int connection_read(ber_socket_t s)
 #define CONNECTION_INPUT_LOOP 1
 /* #define	DATA_READY_LOOP 1 */
 
-	do
-	{
+	do {
 		/* How do we do this without getting into a busy loop ? */
 		rc = connection_input( c );
 	}
 #ifdef DATA_READY_LOOP
-	while( !rc && ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ) );
+	while( !rc && ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ));
 #elif CONNECTION_INPUT_LOOP
 	while(!rc);
 #else
@@ -1567,10 +1566,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;