Revert "More for ITS#6892"

This reverts commit 3cb2ca8bbd1ec8da8f27a608deefc7a2d45aa538.
Patch has no benefit

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index af6e6990ecd08c1cf7499299ef39db4c957d2356..7114eb90f895527c08fd6af0d03bc4a416b43e8e 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1304,12 +1304,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                        op2.o_extra = op->o_extra;
                        op2.o_callback = NULL;
                        if (ss->s_flags & PS_FIX_FILTER) {
-                               Filter *f;
                                /* Skip the AND/GE clause that we stuck on in front. We
                                   would lose deletes/mods that happen during the refresh
                                   phase otherwise (ITS#6555) */
-                               f = ss->s_op->ors_filter->f_and->f_next;
-                               if ( f ) op2.ors_filter = f;
+                               op2.ors_filter = ss->s_op->ors_filter->f_and->f_next;
                        }
                        ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
                        rc = test_filter( &op2, e, op2.ors_filter );