Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / servers / slapd / slapi / slapi_overlay.c

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index 0db4ce2a0498cdde51cf96b7412a1c68e0caf003..0efcd92827a4c18b2b01659e9ce386a00e6a3cc5 100644 (file)
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2013 The OpenLDAP Foundation.
+ * Copyright 2001-2015 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -296,6 +296,7 @@ static int
 slapi_op_search_callback( Operation *op, SlapReply *rs, int prc )
 {
        Slapi_PBlock            *pb = SLAPI_OPERATION_PBLOCK( op );
+       Filter *f = op->ors_filter;
 
        /* check preoperation result code */
        if ( prc < 0 ) {
@@ -310,8 +311,10 @@ slapi_op_search_callback( Operation *op, SlapReply *rs, int prc )
                 * The plugin can set the SLAPI_SEARCH_FILTER.
                 * SLAPI_SEARCH_STRFILER is not normative.
                 */
-               op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
-               filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
+               if (f != op->ors_filter) {
+                       op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
+                       filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
+               }
        }
 
        return LDAP_SUCCESS;
@@ -451,11 +454,11 @@ slapi_over_merge_controls( Operation *op, SlapReply *rs )
        n_slapi_ctrls = slapi_int_count_controls( slapi_ctrls );
        n_rs_ctrls = slapi_int_count_controls( rs->sr_ctrls );
 
-       slapi_pblock_set( pb, SLAPI_X_OLD_RESCONTROLS, (void *)rs->sr_ctrls );
-
        if ( n_slapi_ctrls == 0 )
                return LDAP_SUCCESS; /* no SLAPI controls */
 
+       slapi_pblock_set( pb, SLAPI_X_OLD_RESCONTROLS, (void *)rs->sr_ctrls );
+
        ctrls = (LDAPControl **) op->o_tmpalloc(
                ( n_slapi_ctrls + n_rs_ctrls + 1 ) * sizeof(LDAPControl *),
                op->o_tmpmemctx );