From: Ralf Haferkamp <ralf@openldap.org>
Date: Tue, 28 Aug 2007 11:21:34 +0000 (+0000)
Subject: corrected ITS#4991 fix
X-Git-Tag: OPENLDAP_REL_ENG_2_3_39~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da304e504b7b826fe497976b1c4fdf1a9849560a;p=openldap

corrected ITS#4991 fix
---

diff --git a/CHANGES b/CHANGES
index 206782fdaa..e9bc8990c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.39 Engineering
 	Fixed slapd-sql concurrency issue (ITS#5095)
+        Fixed slapo-pcache and -rwm interaction fix (ITS#4991) 
 	Fixed liblber Windows x64 portability (ITS#5105)
 	Fixed libldap ppolicy control creation (ITS#5103)
 	Documentation
diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 1a71cea0c8..85bf03c3c4 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -1050,7 +1050,6 @@ pcache_response(
 	if ( si->query.save_attrs != NULL ) {
 		rs->sr_attrs = si->query.save_attrs;
 		op->ors_attrs = si->query.save_attrs;
-		si->query.save_attrs = NULL;
 	}
 
 	if ( rs->sr_type == REP_SEARCH ) {