Only return requested attrs in sssvlv response

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

diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 3e5ee67db38928b17481e8864f3b8cf53c45249c..2fc08ed4135d2d5c59502807bf36d998d245e061 100644 (file)
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2009 The OpenLDAP Foundation.
+ * Copyright 2003-2011 The OpenLDAP Foundation.
  * Portions Copyright 2003 Howard Chu.
  * All rights reserved.
  *
@@ -386,11 +386,7 @@ collect_response( Operation *op, SlapReply *rs )
                        * don't modify it directly. Make a copy and
                        * work with that instead.
                        */
-                       if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE )) {
-                               rs->sr_entry = entry_dup( rs->sr_entry );
-                               rs->sr_flags |= REP_ENTRY_MODIFIABLE |
-                                       REP_ENTRY_MUSTBEFREED;
-                       }
+                       rs_entry2modifiable( op, rs, on );
 
                        /* Loop for each attribute in this collectinfo */
                        for(idx=0; idx<ci->ci_ad_num; idx++) {