Modified to use libtool's ltdl instead of gmodule

[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..d18234a0eadc5281dbf95c329dcd313aea35fbdb 100644 (file)
--- a/servers/slapd/back-tcl/tcl_delete.c
+++ b/servers/slapd/back-tcl/tcl_delete.c
@@ -1,5 +1,6 @@
-/*
- * delete.c - tcl delete routines
+/* delete.c - tcl delete routines
+ *
+ * $Id: tcl_delete.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -29,35 +30,37 @@ tcl_back_delete (
 
        if (ti->ti_delete == NULL) {
                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);
+       for (i = 0; be->be_suffix[i] != NULL; i++);
+       suf_tcl = Tcl_Merge (i, be->be_suffix);
 
-       command = (char *) ch_malloc (strlen(ti->ti_delete) + strlen(suf_tcl)
-               + strlen(dn) + 64);
-       sprintf(command, "%s DELETE {%ld} {%s} {%s}",
+       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);
+       Tcl_Free (suf_tcl);
 
-       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);
 }