From: Howard Chu <hyc@openldap.org>
Date: Tue, 16 Jun 2009 04:33:59 +0000 (+0000)
Subject: Partially revert 1.32; pcache must allow other callbacks to see its results
X-Git-Tag: ACLCHECK_0~494
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d852de5ce435e70fbe031729b8495cfa0f469a3c;p=openldap

Partially revert 1.32; pcache must allow other callbacks to see its results
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index d91b6f327c..bff016e920 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -2399,8 +2399,6 @@ pcache_op_search(
 	op->o_tmpfree( tempstr.bv_val, op->o_tmpmemctx );
 
 	if (answerable) {
-		/* Need to clear the callbacks of the original operation,
-		 * in case there are other overlays */
 		BackendDB	*save_bd = op->o_bd;
 		slap_callback	*save_cb = op->o_callback;
 
@@ -2413,7 +2411,6 @@ pcache_op_search(
 			send_ldap_result( op, rs );
 		} else {
 			op->o_bd = &cm->db;
-			op->o_callback = NULL;
 			i = cm->db.bd_info->bi_op_search( op, rs );
 		}
 		ldap_pvt_thread_rdwr_runlock(&answerable->rwlock);