From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 20 Nov 2007 20:02:08 +0000 (+0000)
Subject: ITS#5187
X-Git-Tag: OPENLDAP_REL_ENG_2_4_7~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=66310ec69a63eaf4bc327e963f689f56aa5c300c;p=openldap

ITS#5187
---

diff --git a/CHANGES b/CHANGES
index 8df37a56a5..e38d4d45c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.7 Engineering
 	Fixed slapd syncrepl presentlist handling (ITS#5231)
 	Fixed slapd core schema 'c' definition for RFC4519 (ITS#5236)
 	Fixed slapd-bdb to report and fail on internal errors (ITS#5232)
+	Fixed slapo-pcache op->o_abandon handling (ITS#5187)
 	Fixed slapo-ppolicy single password check on modify (ITS#5146)
 	Fixed slapo-syncprov refresh and persist cookie sending (ITS#5210)
 	Fixed slapo-syncprov ignore invalid cookies (ITS#5211)
diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 6ece33365c..6169728dd5 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -1877,14 +1877,19 @@ cache_entries(
 	Entry		*e;
 	struct berval	crp_uuid;
 	char		uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
-	Operation op_tmp = *op;
+	Operation	*op_tmp;
+	Connection	conn = {0};
+	OperationBuffer opbuf;
+	void		*thrctx = ldap_pvt_thread_pool_context();
 
 	query_uuid->bv_len = lutil_uuidstr(uuidbuf, sizeof(uuidbuf));
 	ber_str2bv(uuidbuf, query_uuid->bv_len, 1, query_uuid);
 
-	op_tmp.o_bd = &cm->db;
-	op_tmp.o_dn = cm->db.be_rootdn;
-	op_tmp.o_ndn = cm->db.be_rootndn;
+	connection_fake_init2( &conn, &opbuf, thrctx, 0 );
+	op_tmp = &opbuf.ob_op;
+	op_tmp->o_bd = &cm->db;
+	op_tmp->o_dn = cm->db.be_rootdn;
+	op_tmp->o_ndn = cm->db.be_rootndn;
 
 	Debug( pcache_debug, "UUID for query being added = %s\n",
 			uuidbuf, 0, 0 );
@@ -1894,10 +1899,10 @@ cache_entries(
 		e->e_private = NULL;
 		while ( cm->cur_entries > (cm->max_entries) ) {
 			BER_BVZERO( &crp_uuid );
-			remove_query_and_data( &op_tmp, rs, cm, &crp_uuid );
+			remove_query_and_data( op_tmp, rs, cm, &crp_uuid );
 		}
 
-		return_val = merge_entry(&op_tmp, e, query_uuid);
+		return_val = merge_entry(op_tmp, e, query_uuid);
 		ldap_pvt_thread_mutex_lock(&cm->cache_mutex);
 		cm->cur_entries += return_val;
 		Debug( pcache_debug,
@@ -1959,7 +1964,8 @@ pcache_op_cleanup( Operation *op, SlapReply *rs ) {
 			rs->sr_attrs = si->save_attrs;
 			op->ors_attrs = si->save_attrs;
 		}
-		if ( op->o_abandon || rs->sr_err == SLAPD_ABANDON ) {
+		if ( (op->o_abandon || rs->sr_err == SLAPD_ABANDON) && 
+				si->caching_reason == PC_IGNORE ) {
 			filter_free( si->query.filter );
 			if ( si->count ) {
 				/* duplicate query, free it */