Add ldap_*2name() in <include,libldap>/schema, use them in slapd/schema

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

diff --git a/servers/slapd/back-tcl/tcl_compare.c b/servers/slapd/back-tcl/tcl_compare.c
index 96e0eaf8a041ebb527868b07b3949386026cc848..3184b5fa582e0ef631e174c0437f3550a1875f47 100644 (file)
--- a/servers/slapd/back-tcl/tcl_compare.c
+++ b/servers/slapd/back-tcl/tcl_compare.c
@@ -1,5 +1,6 @@
-/*
- * compare.c - tcl compare routines
+/* compare.c - tcl compare routines
+ *
+ * $Id: tcl_compare.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -31,37 +32,39 @@ tcl_back_compare (
 
        if (ti->ti_compare == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "compare not implemented");
+                       "compare 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_compare) +
-               strlen(suf_tcl) + strlen(dn) + strlen(ava->ava_type) +
-               strlen(ava->ava_value.bv_val) + 64);
-       sprintf(command, "%s COMPARE {%ld} {%s} {%s} {%s: %s}",
+       command = (char *) ch_malloc (strlen (ti->ti_compare) +
+               strlen (suf_tcl) + strlen (dn) + strlen (ava->ava_type) +
+               strlen (ava->ava_value.bv_val) + 64);
+       sprintf (command, "%s COMPARE {%ld} {%s} {%s} {%s: %s}",
                ti->ti_compare, op->o_msgid, suf_tcl, dn, ava->ava_type,
-       ava->ava_value.bv_val);
-       Tcl_Free(suf_tcl);
+               ava->ava_value.bv_val);
+       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_compare_error: %s\n", results, 0, 0);
+               Debug (LDAP_DEBUG_SHELL, "tcl_compare_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");
-       return (0);
+               send_ldap_result (conn, op, err, NULL,
+                       "internal backend error", NULL, NULL );
 
+       free (results);
+       return (err);
 }