Fix cancel cleanup

[openldap] / servers / slapd / overlays / seqmod.c

diff --git a/servers/slapd/overlays/seqmod.c b/servers/slapd/overlays/seqmod.c
index fca24960c5bdf512dbef52f1052161c5d87b31bc..be2efda0f108506a21b0f29ae8596de24f415c05 100644 (file)
--- a/servers/slapd/overlays/seqmod.c
+++ b/servers/slapd/overlays/seqmod.c
@@ -1,7 +1,7 @@
 /* seqmod.c - sequenced modifies */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,8 +19,6 @@
 
 #include "portable.h"
 
-#define        SLAPD_OVER_SEQMOD       SLAPD_MOD_STATIC
-
 #ifdef SLAPD_OVER_SEQMOD
 
 #include "slap.h"
@@ -54,13 +52,15 @@ sm_avl_cmp( const void *c1, const void *c2 )
 static int
 seqmod_op_cleanup( Operation *op, SlapReply *rs )
 {
-       seqmod_info *sm = op->o_callback->sc_private;
-       modtarget *mt;
+       slap_callback *sc = op->o_callback;
+       seqmod_info *sm = sc->sc_private;
+       modtarget *mt, mtdummy;
        Avlnode  *av;
 
+       mtdummy.mt_op = op;
        /* This op is done, remove it */
        ldap_pvt_thread_mutex_lock( &sm->sm_mutex );
-       av = avl_find( sm->sm_mods, mt, sm_avl_cmp );
+       av = avl_find2( sm->sm_mods, &mtdummy, sm_avl_cmp );
        assert(av);
 
        mt = av->avl_data;
@@ -73,8 +73,8 @@ seqmod_op_cleanup( Operation *op, SlapReply *rs )
                avl_delete( &sm->sm_mods, mt, sm_avl_cmp );
        }
        ldap_pvt_thread_mutex_unlock( &sm->sm_mutex );
-       op->o_callback = op->o_callback->sc_next;
-       op->o_tmpfree( op->o_callback, op->o_tmpmemctx );
+       op->o_callback = sc->sc_next;
+       op->o_tmpfree( sc, op->o_tmpmemctx );
 
        return 0;
 }
@@ -99,7 +99,7 @@ seqmod_op_mod( Operation *op, SlapReply *rs )
         * near-simultaneous mods of the same entry
         */
        ldap_pvt_thread_mutex_lock( &sm->sm_mutex );
-       av = avl_find( sm->sm_mods, mt, sm_avl_cmp );
+       av = avl_find2( sm->sm_mods, mt, sm_avl_cmp );
        if ( av ) {
                modtarget *mtp = av->avl_data;
                mtp->mt_tail->mt_next = mt;