From f860fff7144e1091a0b5f749009d2824280251f5 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 21 Jan 2020 23:36:56 +0000 Subject: [PATCH] ITS#9121 more memberof tweaks --- servers/slapd/overlays/dynlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c index f4ab424da5..6c9f9afca0 100644 --- a/servers/slapd/overlays/dynlist.c +++ b/servers/slapd/overlays/dynlist.c @@ -978,12 +978,12 @@ dynlist_search2resp( Operation *op, SlapReply *rs ) Operation o = *op; o.o_do_not_cache = 1; o.o_groups = NULL; - rc = backend_group( &o, NULL, &dyn->dy_name, + rc = backend_group( &o, e, &dyn->dy_name, &e->e_nname, dyn->dy_dli->dli_oc, dyn->dy_dli->dli_ad ); if ( rc == LDAP_SUCCESS ) { /* ensure e is modifiable, but do not replace * sr_entry yet since we have pointers into it */ - if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE ) ) { + if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE ) && e == rs->sr_entry ) { e = entry_dup( rs->sr_entry ); } attr_merge_one( e, dlm->dlm_memberOf_ad, &dyn->dy_name, &dyn->dy_name );