From 96a068cc4ed6bae28f7392b537d89b70c98a9a3c Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Sun, 12 Dec 2010 02:08:23 +0000 Subject: [PATCH] ITS#6640 --- CHANGES | 1 + servers/slapd/overlays/pcache.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 2beb452651..c997dd92d1 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,7 @@ OpenLDAP 2.4.24 Engineering Fixed slapd modify to return actual error (ITS#6581) Fixed slapd-bdb entry cache delete failure (ITS#6577) Fixed slapd-null back-config support (ITS#6624) + Fixed slapo-pcache callback freeing (ITS#6640) Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608) Fixed slapo-syncprov to send error if consumer is newer (ITS#6606) diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c index 46ce69ce69..88b90c3a32 100644 --- a/servers/slapd/overlays/pcache.c +++ b/servers/slapd/overlays/pcache.c @@ -2389,8 +2389,7 @@ over:; entry_free(si->head); } } - op->o_callback = op->o_callback->sc_next; - op->o_tmpfree( cb, op->o_tmpmemctx ); + } else if ( si->caching_reason != PC_IGNORE ) { CachedQuery *qc = qm->addfunc(op, qm, &si->query, si->qtemp, si->caching_reason, 1 ); @@ -2446,6 +2445,9 @@ over:; } else { filter_free( si->query.filter ); } + + op->o_callback = op->o_callback->sc_next; + op->o_tmpfree( cb, op->o_tmpmemctx ); } return SLAP_CB_CONTINUE; -- 2.39.5