Add dummy reference to lutil_uuidstr() for dynamically loaded back-bdb

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

diff --git a/servers/slapd/back-tcl/tcl_add.c b/servers/slapd/back-tcl/tcl_add.c
index d341c22317b2a20aaad7f8143af88c05804e129a..96f0d8ee9f131ee712a7f9790f1bc0d63f89009a 100644 (file)
--- a/servers/slapd/back-tcl/tcl_add.c
+++ b/servers/slapd/back-tcl/tcl_add.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* add.c - tcl add routine
- *
- * $Id: tcl_add.c,v 1.5.6.1 1999/07/09 18:02:59 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -25,27 +24,31 @@ tcl_back_add (
        Entry * e
 )
 {
-       char *command, *suf_tcl, *entrystr, *results;
-       int i, code, err = 0;
+       char *command, *entrystr, *results;
+       struct berval suf_tcl;
+       int code, err = 0;
        struct tclinfo *ti = (struct tclinfo *) be->be_private;
 
-       if (ti->ti_add == NULL) {
+       if (ti->ti_add.bv_len == 0) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "add not implemented", NULL );
+                       "add 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);
+       }
 
-       entrystr = tcl_clean_entry (e);
+       entrystr = tcl_clean_entry(e);
 
-       command = (char *) ch_malloc (strlen (ti->ti_add) + strlen
-               (suf_tcl) +
-               strlen (entrystr) + 32);
-       sprintf (command, "%s ADD {%ld} {%s} {%s}",
-               ti->ti_add, op->o_msgid, suf_tcl, entrystr);
-       Tcl_Free (suf_tcl);
+       command = (char *) ch_malloc (ti->ti_add.bv_len + suf_tcl.bv_len +
+               strlen(entrystr) + 52);
+       sprintf (command, "%s ADD {%ld/%ld} {%s} {%s}",
+               ti->ti_add.bv_val, op->o_connid, (long) op->o_msgid, 
+               suf_tcl.bv_val, entrystr);
+       Tcl_Free (suf_tcl.bv_val);
        free (entrystr);
 
        ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
@@ -63,7 +66,7 @@ tcl_back_add (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);