From: Howard Chu <hyc@openldap.org>
Date: Mon, 17 Aug 2009 13:11:05 +0000 (+0000)
Subject: Fix refresh_merge, using mods from wrong entry
X-Git-Tag: ACLCHECK_0~315
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=deb1fb6eb68b2bd5e0da4e8b6e72994d63c8f627;p=openldap

Fix refresh_merge, using mods from wrong entry
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 86ea8b8262..7f4d861fc6 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -2735,7 +2735,7 @@ refresh_merge( Operation *op, SlapReply *rs )
 				}
 			}
 			*b = NULL;
-			slap_entry2mods( &ne, &modlist, &text, textbuf, textlen );
+			slap_entry2mods( rs->sr_entry, &modlist, &text, textbuf, textlen );
 			syncrepl_diff_entry( op, ne.e_attrs, rs->sr_entry->e_attrs,
 				&mods, &modlist, 0 );
 			be_entry_release_r( op, e );