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

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

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 7eca86a6dcc457eaec62583f16e135e28d9c43e9..ec43fb87bdf16b491071ac976f140f835c9e85f8 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-2011 The OpenLDAP Foundation.
+ * Copyright 2009-2012 The OpenLDAP Foundation.
  * Portions copyright 2009 Symas Corporation.
  * All rights reserved.
  *
@@ -436,6 +436,8 @@ static void send_list(
        Entry *e;
        LDAPControl *ctrls[2];
 
+       rs->sr_attrs = op->ors_attrs;
+
        /* FIXME: it may be better to just flatten the tree into
         * an array before doing all of this...
         */
@@ -586,6 +588,8 @@ static void send_page( Operation *op, SlapReply *rs, sort_op *so )
        Entry *e;
        int rc;
 
+       rs->sr_attrs = op->ors_attrs;
+
        while ( cur_node && rs->sr_nentries < so->so_page_size ) {
                sort_node *sn = cur_node->avl_data;
 
@@ -630,8 +634,6 @@ static void send_entry(
        if ( !so->so_tree )
                return;
 
-       rs->sr_attrs = op->ors_attrs;
-
        /* RFC 2891: If critical then send the entries iff they were
         * succesfully sorted.  If non-critical send all entries
         * whether they were sorted or not.
@@ -1074,6 +1076,9 @@ static int build_key(
        return rs->sr_err;
 }
 
+/* Conforms to RFC4510 re: Criticality, original RFC2891 spec is broken
+ * Also see ITS#7253 for discussion
+ */
 static int sss_parseCtrl(
        Operation               *op,
        SlapReply               *rs,