Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5

[openldap] / servers / slapd / overlays / sssvlv.c

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 3635834b60c61a7602b4f5402f5afc241cbebbfb..10567799a124dd2780c5ee582a09d11cfe9ada24 100644 (file)
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2009-2013 The OpenLDAP Foundation.
+ * Copyright 2009-2014 The OpenLDAP Foundation.
  * Portions copyright 2009 Symas Corporation.
  * All rights reserved.
  *
@@ -397,7 +397,19 @@ static void free_sort_op( Connection *conn, sort_op *so )
 {
        int sess_id;
        if ( so->so_tree ) {
-               tavl_free( so->so_tree, ch_free );
+               if ( so->so_paged > SLAP_CONTROL_IGNORED ) {
+                       Avlnode *cur_node, *next_node;
+                       cur_node = so->so_tree;
+                       while ( cur_node ) {
+                               next_node = tavl_next( cur_node, TAVL_DIR_RIGHT );
+                               ch_free( cur_node->avl_data );
+                               ber_memfree( cur_node );
+
+                               cur_node = next_node;
+                       }
+               } else {
+                       tavl_free( so->so_tree, ch_free );
+               }
                so->so_tree = NULL;
        }
 
@@ -618,6 +630,8 @@ static void send_page( Operation *op, SlapReply *rs, sort_op *so )
 
        /* Set the first entry to send for the next page */
        so->so_tree = next_node;
+       if ( next_node )
+               next_node->avl_left = NULL;
 
        op->o_bd = be;
 }
@@ -1254,7 +1268,7 @@ static ConfigTable sssvlv_cfg[] = {
                "( OLcfgOvAt:21.2 NAME 'olcSssVlvMaxKeys' "
                        "DESC 'Maximum number of Keys in a Sort request' "
                        "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
-       { "sssvlv-maxpercon", "num",
+       { "sssvlv-maxperconn", "num",
                2, 2, 0, ARG_INT|ARG_OFFSET,
                        (void *)offsetof(sssvlv_info, svi_max_percon),
                "( OLcfgOvAt:21.3 NAME 'olcSssVlvMaxPerConn' "