X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-tcl%2Ftcl_modrdn.c;h=361789b77d3f24666ac1b75f0beb429e2a0797ec;hb=ecfb311f8f2b4f8b8e74c0ee88b8ef572e792c99;hp=e6af8b2b0340dd6fa9a0e6942ec6c4e1c0ad27ac;hpb=654f21b2374610765c4846108728b4cd1e1c501d;p=openldap

diff --git a/servers/slapd/back-tcl/tcl_modrdn.c b/servers/slapd/back-tcl/tcl_modrdn.c
index e6af8b2b03..361789b77d 100644
--- a/servers/slapd/back-tcl/tcl_modrdn.c
+++ b/servers/slapd/back-tcl/tcl_modrdn.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* modrdn.c - tcl modify rdn routines
- *
- * $Id: tcl_modrdn.c,v 1.6 1999/03/05 02:42:46 gomez Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -35,38 +34,49 @@ tcl_back_modrdn (
 	Backend * be,
 	Connection * conn,
 	Operation * op,
-	char *dn,
-	char *newrdn,
+	struct berval *dn,
+	struct berval *ndn,
+	struct berval *newrdn,
+	struct berval *nnewrdn,
 	int deleteoldrdn,
-	char *newSuperior
+	struct berval *newSuperior,
+	struct berval *nnewSuperior
 )
 {
-	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_modrdn == NULL) {
+	if (ti->ti_modrdn.bv_len == 0) {
 		send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-			"modrdn not implemented");
+			"modrdn 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_modrdn) + strlen (suf_tcl)
-		+ strlen (dn) + strlen (newrdn)
-		+ (newSuperior ? strlen(newSuperior) : 0) + 64);
+	command = (char *) ch_malloc (ti->ti_modrdn.bv_len + suf_tcl.bv_len
+		+ dn->bv_len + newrdn->bv_len
+		+ (newSuperior ? newSuperior->bv_len : 0) + 84);
 	if ( newSuperior ) {
-		sprintf (command, "%s MODRDN {%ld} {%s} {%s} {%s} %d {%s}",
-			 ti->ti_add, op->o_msgid, suf_tcl, dn, newrdn,
-			 deleteoldrdn ? 1 : 0, newSuperior );
+		sprintf (command, "%s MODRDN {%ld/%ld} {%s} {%s} {%s} %d {%s}",
+			 ti->ti_modrdn.bv_val,
+			 op->o_connid, (long) op->o_msgid, 
+			 suf_tcl.bv_val, dn->bv_val,
+			 newrdn->bv_val, deleteoldrdn ? 1 : 0, 
+			 newSuperior->bv_val );
 	} else {
 		sprintf (command, "%s MODRDN {%ld} {%s} {%s} {%s} %d",
-			 ti->ti_add, op->o_msgid, suf_tcl, dn, newrdn,
-			 deleteoldrdn ? 1 : 0 );
+			 ti->ti_modrdn.bv_val, (long) op->o_msgid, 
+			 suf_tcl.bv_val, dn->bv_val,
+			 newrdn->bv_val, deleteoldrdn ? 1 : 0 );
 	}	
-	Tcl_Free (suf_tcl);
+	Tcl_Free (suf_tcl.bv_val);
 
 	ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
 	code = Tcl_GlobalEval (ti->ti_ii->interp, command);
@@ -84,7 +94,7 @@ tcl_back_modrdn (
 
 	if (err != LDAP_SUCCESS)
 		send_ldap_result (conn, op, err, NULL,
-			"internal backend error");
+			"internal backend error", NULL, NULL );
 
 	free (results);
 	return (err);