#ifdef for slap_auxprop_store

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

diff --git a/servers/slapd/back-tcl/tcl_modrdn.c b/servers/slapd/back-tcl/tcl_modrdn.c
index 3e2c2f7e4f103b4c81ec22518e6f9fb92788a7a5..af13d2232c28cf0c86a399975568e1bc84e1e880 100644 (file)
--- 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.8 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -32,41 +31,43 @@
 
 int
 tcl_back_modrdn (
-       Backend * be,
-       Connection * conn,
        Operation * op,
-       char *dn,
-       char *newrdn,
-       int deleteoldrdn,
-       char *newSuperior
+       SlapReply * rs
 )
 {
-       char *command, *suf_tcl, *results;
-       int i, code, err = 0;
-       struct tclinfo *ti = (struct tclinfo *) be->be_private;
+       char *command, *results;
+       struct berval suf_tcl;
+       int code;
+       struct tclinfo *ti = (struct tclinfo *) op->o_bd->be_private;
 
-       if (ti->ti_modrdn == NULL) {
-               send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "modrdn not implemented", NULL, NULL );
+       if (ti->ti_modrdn.bv_len == 0) {
+               send_ldap_error (op, rs, LDAP_UNWILLING_TO_PERFORM,
+                       "modrdn not implemented" );
                return (-1);
        }
 
-       for (i = 0; be->be_suffix[i] != NULL; i++);
-       suf_tcl = Tcl_Merge (i, be->be_suffix);
+       if (tcl_merge_bvlist (op->o_bd->be_suffix, &suf_tcl) == NULL) {
+               send_ldap_error (op, rs, LDAP_OTHER, NULL);
+               return (-1);
+       }
 
-       command = (char *) ch_malloc (strlen (ti->ti_modrdn) + strlen (suf_tcl)
-               + strlen (dn) + strlen (newrdn)
-               + (newSuperior ? strlen(newSuperior) : 0) + 64);
-       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 );
+       command = (char *) ch_malloc (ti->ti_modrdn.bv_len + suf_tcl.bv_len
+               + op->o_req_dn.bv_len + op->oq_modrdn.rs_newrdn.bv_len
+               + (op->oq_modrdn.rs_newSup ? op->oq_modrdn.rs_newSup->bv_len : 0) + 84);
+       if ( op->oq_modrdn.rs_newSup ) {
+               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, op->o_req_dn.bv_val,
+                        op->oq_modrdn.rs_newrdn.bv_val, op->oq_modrdn.rs_deleteoldrdn ? 1 : 0, 
+                        op->oq_modrdn.rs_newSup->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, op->o_req_dn.bv_val,
+                        op->oq_modrdn.rs_newrdn.bv_val, op->oq_modrdn.rs_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);
@@ -75,17 +76,18 @@ tcl_back_modrdn (
        free (command);
 
        if (code != TCL_OK) {
-               err = LDAP_OPERATIONS_ERROR;
+               rs->sr_err = LDAP_OTHER;
                Debug (LDAP_DEBUG_SHELL, "tcl_modrdn_error: %s\n", results,
                        0, 0);
        } else {
-               interp_send_results (be, conn, op, results, NULL, 0);
+               interp_send_results (op, rs, results);
        }
 
-       if (err != LDAP_SUCCESS)
-               send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL, NULL );
+       if (rs->sr_err != LDAP_SUCCESS) {
+               rs->sr_text = "internal backend error";
+               send_ldap_result (op, rs);
+       }
 
        free (results);
-       return (err);
+       return (rs->sr_err);
 }