ITS#5451 glue deadlock fix

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index dade31d5aa21e1734a45581757e05aad7dfb5c61..9ca4153f7c59dfb59157f0279ddc43e6b9abc30b 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2396,7 +2396,14 @@ syncprov_operational(
 
                                if ( !ap ) {
                                        if ( !(rs->sr_flags & REP_ENTRY_MODIFIABLE) ) {
-                                               rs->sr_entry = entry_dup( rs->sr_entry );
+                                               Entry *e = entry_dup( rs->sr_entry );
+                                               if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
+                                                       overlay_entry_release_ov( op, rs->sr_entry, 0, on );
+                                                       rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
+                                               } else if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
+                                                       entry_free( rs->sr_entry );
+                                               }
+                                               rs->sr_entry = e;
                                                rs->sr_flags |=
                                                        REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED;
                                                a = attr_find( rs->sr_entry->e_attrs,