X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-tcl%2Ftcl_compare.c;h=3bb705cce75c2fead8172373ce50d1bc2eddbfc8;hb=ecfb311f8f2b4f8b8e74c0ee88b8ef572e792c99;hp=1882605e122cb58781948f3ea5c32f981b7a734d;hpb=8667671d1733b344c51150e28a3090bc4d64feb2;p=openldap

diff --git a/servers/slapd/back-tcl/tcl_compare.c b/servers/slapd/back-tcl/tcl_compare.c
index 1882605e12..3bb705cce7 100644
--- a/servers/slapd/back-tcl/tcl_compare.c
+++ b/servers/slapd/back-tcl/tcl_compare.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* compare.c - tcl compare routines
- *
- * $Id: tcl_compare.c,v 1.2 1999/02/17 01:05:28 bcollins Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -22,40 +21,46 @@ tcl_back_compare (
 	Backend * be,
 	Connection * conn,
 	Operation * op,
-	char *dn,
-	Ava * ava
+	struct berval *dn,
+	struct berval *ndn,
+	AttributeAssertion * ava
 )
 {
-	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_compare == NULL) {
+	if (ti->ti_compare.bv_len == 0) {
 		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);
+	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_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);
+	command = (char *) ch_malloc (ti->ti_compare.bv_len +
+		suf_tcl.bv_len + dn->bv_len + ava->aa_desc->ad_cname.bv_len +
+		ava->aa_value.bv_len + 84);
+	sprintf (command, "%s COMPARE {%ld/%ld} {%s} {%s} {%s: %s}",
+		ti->ti_compare.bv_val, op->o_connid, (long) op->o_msgid,
+		suf_tcl.bv_val, dn->bv_val,
+		ava->aa_desc->ad_cname.bv_val, ava->aa_value.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);
+	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,
+		Debug (LDAP_DEBUG_SHELL, "tcl_compare_error: %s\n", results,
 			0, 0);
 	} else {
 		interp_send_results (be, conn, op, results, NULL, 0);
@@ -63,8 +68,8 @@ tcl_back_compare (
 
 	if (err != LDAP_SUCCESS)
 		send_ldap_result (conn, op, err, NULL,
-			"internal backend error");
+			"internal backend error", NULL, NULL );
 
-	free(results);
+	free (results);
 	return (err);
 }