Don't use 'shtool mkln' as ln(1) replacement.

[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 1dac7444c84017d0915dbee2d5f3bb9933fa7a14..360b0d72c438244dd19980c773c0f9be48c0af9f 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.5 1999/02/28 04:55:49 bcollins Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -35,10 +34,11 @@ tcl_back_modrdn (
        Backend * be,
        Connection * conn,
        Operation * op,
-       char *dn,
-       char *newrdn,
+       const char *dn,
+       const char *ndn,
+       const char *newrdn,
        int deleteoldrdn,
-       char *newSuperior
+       const char *newSuperior
 )
 {
        char *command, *suf_tcl, *results;
@@ -47,7 +47,7 @@ tcl_back_modrdn (
 
        if (ti->ti_modrdn == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "modrdn not implemented");
+                       "modrdn not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -55,10 +55,17 @@ tcl_back_modrdn (
        suf_tcl = Tcl_Merge (i, be->be_suffix);
 
        command = (char *) ch_malloc (strlen (ti->ti_modrdn) + strlen (suf_tcl)
-               + strlen (dn) + strlen (newrdn) + 64);
-       sprintf (command, "%s MODRDN {%ld} {%s} {%s} {%s} %d",
-               ti->ti_add, op->o_msgid, suf_tcl, dn, newrdn, deleteoldrdn
-               ? 1 : 0);
+               + 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 );
+       } else {
+               sprintf (command, "%s MODRDN {%ld} {%s} {%s} {%s} %d",
+                        ti->ti_add, op->o_msgid, suf_tcl, dn, newrdn,
+                        deleteoldrdn ? 1 : 0 );
+       }       
        Tcl_Free (suf_tcl);
 
        ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
@@ -77,7 +84,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);