Fix abandon, only drop our cloned ops, not real frontend ops

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 4b7e61a889e2ce274fc318a009a9981f929aab7b..98cfe6554f57fe4d3d36ee238fd24ff4315cb3f0 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -882,7 +882,12 @@ syncprov_op_abandon( Operation *op, SlapReply *rs )
                        rs->sr_err = LDAP_CANCELLED;
                        send_ldap_result( so->s_op, rs );
                }
-               syncprov_drop_psearch( so, 0 );
+               /* Our cloned searches have no ctrls set.
+                * we don't want to muck with real search ops
+                * from the frontend.
+                */
+               if ( ! so->s_op->o_sync )
+                       syncprov_drop_psearch( so, 0 );
        }
        return SLAP_CB_CONTINUE;
 }