Free IDL_CACHE locks

[openldap] / servers / slapd / back-tcl / tcl_abandon.c

diff --git a/servers/slapd/back-tcl/tcl_abandon.c b/servers/slapd/back-tcl/tcl_abandon.c
index 12bfb729dbcb3a34ac2fb29fc56bc404fa0bc87a..1be1ccbd9c600b7c433e28a324d4a7a838f4f296 100644 (file)
--- a/servers/slapd/back-tcl/tcl_abandon.c
+++ b/servers/slapd/back-tcl/tcl_abandon.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* abandon.c - tcl abandon routine
- *
- * $Id: tcl_abandon.c,v 1.4 1999/02/19 06:55:20 bcollins Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -19,28 +18,29 @@
 
 int
 tcl_back_abandon (
-       Backend * be,
-       Connection * conn,
        Operation * op,
-       int msgid
+       SlapReply * rs
 )
 {
-       char *suf_tcl, *results, *command;
-       int i, code, err = 0;
-       struct tclinfo *ti = (struct tclinfo *) be->be_private;
+       char *results, *command;
+       struct berval suf_tcl;
+       int code, err = 0;
+       struct tclinfo *ti = (struct tclinfo *) op->o_bd->be_private;
 
-       if (ti->ti_abandon == NULL) {
+       if (ti->ti_abandon.bv_len == 0) {
                return (-1);
        }
 
-       for (i = 0; be->be_suffix[i] != NULL; i++);
-       suf_tcl = Tcl_Merge (i, be->be_suffix);
+       if (tcl_merge_bvlist(op->o_bd->be_suffix, &suf_tcl) == NULL) {
+               return (-1);
+       }
 
-       command = (char *) ch_malloc (strlen (ti->ti_abandon) + strlen (suf_tcl)
-               + 20);
-       sprintf (command, "%s ABANDON {%ld} {%s}",
-               ti->ti_abandon, op->o_msgid, suf_tcl);
-       Tcl_Free (suf_tcl);
+       command = (char *) ch_malloc (ti->ti_abandon.bv_len + suf_tcl.bv_len
+               + 80);
+       sprintf (command, "%s ABANDON {%ld/%ld} {%s} {%ld/%d}",
+               ti->ti_abandon.bv_val, op->o_connid, (long) op->o_msgid,
+               suf_tcl.bv_val, op->o_connid, op->oq_abandon.rs_msgid);
+       Tcl_Free (suf_tcl.bv_val);
 
        ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
        code = Tcl_GlobalEval (ti->ti_ii->interp, command);
@@ -49,7 +49,7 @@ tcl_back_abandon (
        free (command);
 
        if (code != TCL_OK) {
-               err = LDAP_OPERATIONS_ERROR;
+               err = LDAP_OTHER;
                Debug (LDAP_DEBUG_SHELL, "tcl_abandon_error: %s\n", results,
                        0, 0);
        }