ITS#6708

diff --git a/CHANGES b/CHANGES
index 27edc2a4ec7b605a9d0018a528af052b48a8501c..f8fde1e81330161dee86883878ffa5f68def6c8b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608)
        Fixed slapo-sssvlv initialization (ITS#6649)
        Fixed slapo-syncprov to send error if consumer is newer (ITS#6606)
+       Fixed slapo-syncprov properly mutex filter (ITS#6708)
        Fixed contrib/nssov to only close socket on shutdown (ITS#6676)
        Documentation
                admin24 guide typo fixes (ITS#6609)

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 60db65e1b8ddeb06d3be7bd40228b8810b336169..c708dc6db64c0161deee7cb3d2b16a29e1fdae81 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1293,6 +1293,7 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                }
 
                if ( fc.fscope ) {
+                       ldap_pvt_thread_mutex_lock( &ss->s_mutex );
                        op2 = *ss->s_op;
                        oh = *op->o_hdr;
                        oh.oh_conn = ss->s_op->o_conn;
@@ -1301,7 +1302,6 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                        op2.o_hdr = &oh;
                        op2.o_extra = op->o_extra;
                        op2.o_callback = NULL;
-                       ldap_pvt_thread_mutex_lock( &ss->s_mutex );
                        if (ss->s_flags & PS_FIX_FILTER) {
                                /* Skip the AND/GE clause that we stuck on in front. We
                                   would lose deletes/mods that happen during the refresh
@@ -2606,10 +2606,14 @@ shortcut:
 #endif
                ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx );
                fava->f_next = op->ors_filter;
+               if ( sop )
+                       ldap_pvt_thread_mutex_lock( &sop->s_mutex );
                op->ors_filter = fand;
                filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
-               if ( sop )
+               if ( sop ) {
                        sop->s_flags |= PS_FIX_FILTER;
+                       ldap_pvt_thread_mutex_unlock( &sop->s_mutex );
+               }
        }
 
        /* Let our callback add needed info to returned entries */