ITS#6242

diff --git a/CHANGES b/CHANGES
index d354f3c64196edfbfd3fc3ec224b0bc92b59fd34..3cd5f68c8b6c195fd34d08518542372adf73cc37 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.19 Engineering
+       Fixed slapo-pcache cache corruption (ITS#6242)
 
 OpenLDAP 2.4.18 Release (2009/09/06)
        Fixed client tools common options (ITS#6049)

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 0b74a736e0a39d55f9a261a79053aead7bbe6b10..eac0f6205d5ceeb3eaac79e4f285d3c992125a21 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -862,6 +862,7 @@ merge_entry(
                        modlist->sml_op = LDAP_MOD_ADD;
                        op->o_tag = LDAP_REQ_MODIFY;
                        op->orm_modlist = modlist;
+                       op->o_managedsait = SLAP_CONTROL_CRITICAL;
                        op->o_bd->be_modify( op, &sreply );
                        slap_mods_free( modlist, 1 );
                } else if ( rc == LDAP_REFERRAL ||