From 34813d9cba02a74216a784636a8d5f0f986d73c7 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 4 Nov 2025 16:14:55 +0000 Subject: [PATCH] ITS#10329 slapo-pcache: don't clobber original request DN in merge_entry() --- servers/slapd/overlays/pcache.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c index 1f9b17eb9e..43b06ed4ab 100644 --- a/servers/slapd/overlays/pcache.c +++ b/servers/slapd/overlays/pcache.c @@ -847,6 +847,7 @@ merge_entry( Attribute *attr; char textbuf[SLAP_TEXT_BUFLEN]; size_t textlen = sizeof(textbuf); + struct berval odn, ondn; SlapReply sreply = {REP_RESULT}; @@ -869,6 +870,9 @@ merge_entry( op->o_time = slap_get_time(); op->o_do_not_cache = 1; + odn = op->o_req_dn; + ondn = op->o_req_ndn; + op->ora_e = e; op->o_req_dn = e->e_name; op->o_req_ndn = e->e_nname; @@ -900,8 +904,8 @@ merge_entry( rc = 1; } - BER_BVZERO(&op->o_req_dn); - BER_BVZERO(&op->o_req_ndn); + op->o_req_dn = odn; + op->o_req_ndn = ondn; return rc; } -- 2.47.3