Fixes for NO_THREADS

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

diff --git a/servers/slapd/back-tcl/tcl_unbind.c b/servers/slapd/back-tcl/tcl_unbind.c
index 1f70c629ff7006b332dd2ab4061aa04cd3d33312..abb0beff94b5b8e3ccc8ba687c371929ac13e76d 100644 (file)
--- a/servers/slapd/back-tcl/tcl_unbind.c
+++ b/servers/slapd/back-tcl/tcl_unbind.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* unbind.c - tcl unbind routines
- *
- * $Id: tcl_unbind.c,v 1.3 1999/02/18 01:18:39 bcollins Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -24,25 +23,25 @@ tcl_back_unbind (
        Operation * op
 )
 {
-       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_unbind == NULL) {
-               send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "unbind not implemented");
+       if (ti->ti_unbind.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 (be->be_suffix, &suf_tcl) == NULL) {
+               return (-1);
+       }
 
-       command = (char *) ch_malloc (strlen (ti->ti_unbind) + strlen (suf_tcl)
-               + strlen (conn->c_dn ? conn->c_dn : "") + 64);
-       sprintf (command, "%s UNBIND {%ld} {%s} {%s}",
-               ti->ti_unbind, op->o_msgid, suf_tcl, conn->c_dn ?
-               conn->c_dn : "");
-       Tcl_Free (suf_tcl);
+       command = (char *) ch_malloc (ti->ti_unbind.bv_len + suf_tcl.bv_len
+               + conn->c_dn.bv_len + 84);
+       sprintf (command, "%s UNBIND {%ld/%ld} {%s} {%s}",
+               ti->ti_unbind.bv_val, op->o_connid, (long) op->o_msgid,
+               suf_tcl.bv_val, conn->c_dn.bv_val ?  conn->c_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);
@@ -51,7 +50,7 @@ tcl_back_unbind (
        free (command);
 
        if (code != TCL_OK) {
-               Debug (LDAP_DEBUG_ANY, "tcl_unbind_error: %s\n", results,
+               Debug (LDAP_DEBUG_SHELL, "tcl_unbind_error: %s\n", results,
                        0, 0);
        }