Fixes for NO_THREADS

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

diff --git a/servers/slapd/back-tcl/tcl_delete.c b/servers/slapd/back-tcl/tcl_delete.c
index 24771913b0b8525e1fa28e34d00888cfe95b6250..9047d7d65f1208b97970e2f8c1d437b3bb7e50af 100644 (file)
--- a/servers/slapd/back-tcl/tcl_delete.c
+++ b/servers/slapd/back-tcl/tcl_delete.c
@@ -1,5 +1,5 @@
-/*
- * delete.c - tcl delete routines
+/* $OpenLDAP$ */
+/* delete.c - tcl delete routines
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -16,48 +16,57 @@
 #include "slap.h"
 #include "tcl_back.h"
 
+int
 tcl_back_delete (
        Backend * be,
        Connection * conn,
        Operation * op,
-       char *dn
+       struct berval *dn,
+       struct berval *ndn
 )
 {
-       char *command, *suf_tcl, *results;
-       int i, code, err = 0;
+       char *command, *results;
+       struct berval suf_tcl;
+       int code, err = 0;
        struct tclinfo *ti = (struct tclinfo *) be->be_private;
 
-       if (ti->ti_delete == NULL) {
+       if (ti->ti_delete.bv_len == 0) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "delete not implemented");
+                       "delete not implemented", NULL, NULL );
                return (-1);
        }
 
-       for ( i = 0; be->be_suffix[i] != NULL; i++ )
-               ;
-       suf_tcl = Tcl_Merge(i, be->be_suffix);
+       if (tcl_merge_bvlist (be->be_suffix, &suf_tcl) == NULL) {
+               send_ldap_result (conn, op, LDAP_OPERATIONS_ERROR, NULL,
+                       NULL, NULL, NULL );
+               return (-1);
+       }
 
-       command = (char *) ch_malloc (strlen(ti->ti_delete) + strlen(suf_tcl)
-               + strlen(dn) + 64);
-       sprintf(command, "%s DELETE {%ld} {%s} {%s}",
-               ti->ti_delete, op->o_msgid, suf_tcl, dn);
-       Tcl_Free(suf_tcl);
+       command = (char *) ch_malloc (ti->ti_delete.bv_len + suf_tcl.bv_len
+               + dn->bv_len + 84);
+       sprintf (command, "%s DELETE {%ld/%ld} {%s} {%s}",
+               ti->ti_delete.bv_val, op->o_connid, (long) op->o_msgid,
+               suf_tcl.bv_val, dn->bv_val);
+       Tcl_Free (suf_tcl.bv_val);
 
-       ldap_pvt_thread_mutex_lock( &tcl_interpreter_mutex );
-       code = Tcl_GlobalEval(ti->ti_ii->interp, command);
-       results = (char *) strdup(ti->ti_ii->interp->result);
-       ldap_pvt_thread_mutex_unlock( &tcl_interpreter_mutex );
-       free(command);
+       ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
+       code = Tcl_GlobalEval (ti->ti_ii->interp, command);
+       results = (char *) ch_strdup (ti->ti_ii->interp->result);
+       ldap_pvt_thread_mutex_unlock (&tcl_interpreter_mutex);
+       free (command);
 
        if (code != TCL_OK) {
                err = LDAP_OPERATIONS_ERROR;
-               Debug(LDAP_DEBUG_ANY, "tcl_delete_error: %s\n", results, 0, 0);
+               Debug (LDAP_DEBUG_SHELL, "tcl_delete_error: %s\n", results,
+                       0, 0);
        } else {
-               interp_send_results ( be, conn, op, results, NULL, 0 );
+               interp_send_results (be, conn, op, results, NULL, 0);
        }
 
        if (err != LDAP_SUCCESS)
-               send_ldap_result (conn, op, err, NULL, "internal backend error");
+               send_ldap_result (conn, op, err, NULL,
+                       "internal backend error", NULL, NULL );
 
-       return (0);
+       free (results);
+       return (err);
 }