ITS#10329 slapo-pcache: don't clobber original request DN

in merge_entry()
This commit is contained in:
Howard Chu 2025-11-04 16:14:55 +00:00 committed by Quanah Gibson-Mount
parent 9ae2539170
commit 34813d9cba

View file

@ -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;
}