+/* $OpenLDAP$ */
/* modrdn.c - tcl modify rdn routines
- *
- * $Id: tcl_modrdn.c,v 1.3 1999/02/18 01:18:39 bcollins Exp $
*
* Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
*
* in file LICENSE in the top-level directory of the distribution.
*/
+/*
+ * LDAP v3 newSuperior support.
+ *
+ * Copyright 1999, Juan C. Gomez, All rights reserved.
+ * This software is not subject to any license of Silicon Graphics
+ * Inc. or Purdue University.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * without restriction or fee of any kind as long as this notice
+ * is preserved.
+ *
+ */
+
#include "portable.h"
#include <stdio.h>
Backend * be,
Connection * conn,
Operation * op,
- char *dn,
- char *newrdn,
- int deleteoldrdn
+ struct berval *dn,
+ struct berval *ndn,
+ struct berval *newrdn,
+ struct berval *nnewrdn,
+ int deleteoldrdn,
+ 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) + 64);
- 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);
+ 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/%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_modrdn.bv_val, (long) op->o_msgid,
+ suf_tcl.bv_val, dn->bv_val,
+ newrdn->bv_val, deleteoldrdn ? 1 : 0 );
+ }
+ Tcl_Free (suf_tcl.bv_val);
ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
code = Tcl_GlobalEval (ti->ti_ii->interp, command);
if (code != TCL_OK) {
err = LDAP_OPERATIONS_ERROR;
- Debug (LDAP_DEBUG_ANY, "tcl_modrdn_error: %s\n", results,
+ Debug (LDAP_DEBUG_SHELL, "tcl_modrdn_error: %s\n", results,
0, 0);
} else {
interp_send_results (be, conn, op, results, NULL, 0);
if (err != LDAP_SUCCESS)
send_ldap_result (conn, op, err, NULL,
- "internal backend error");
+ "internal backend error", NULL, NULL );
free (results);
return (err);