clear pagedresults_state if reusing an inactive connection; prepare for more consiste...

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 228c2ee00937af363663f74867dd10f16c03844a..934e067f8dca40c5602e9e2083400a2e742dc490 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1573,6 +1573,10 @@ connection_input(
        op->o_preread_attrs = NULL;
        op->o_postread_attrs = NULL;
        op->o_vrFilter = NULL;
+       /* clear state if the connection is being reused from inactive */
+       if ( conn->c_conn_state == SLAP_C_INACTIVE ) {
+               memset( &conn->c_pagedresults_state, 0, sizeof( conn->c_pagedresults_state ) );
+       }
        op->o_pagedresults_state = conn->c_pagedresults_state;
 
        op->o_res_ber = NULL;