Backend * be,
Connection * conn,
Operation * op,
- char *dn,
+ struct berval *dn,
+ struct berval *ndn,
int method,
- char *mech,
struct berval *cred,
- char **edn
+ struct berval *edn
)
{
- 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;
- *edn = NULL;
-
- if (ti->ti_bind == NULL) {
+ if (ti->ti_bind.bv_len == 0) {
send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
"bind 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_bind) + strlen
- (suf_tcl) +
- strlen (dn) + strlen (cred->bv_val) + 64);
- sprintf (command, "%s BIND {%ld} {%s} {%s} {%d} {%lu} {%s}",
- ti->ti_bind, op->o_msgid, suf_tcl, dn, method, cred->bv_len,
- cred->bv_val);
- Tcl_Free (suf_tcl);
+ command = (char *) ch_malloc (ti->ti_bind.bv_len + suf_tcl.bv_len +
+ dn->bv_len + cred->bv_len + 84);
+ sprintf (command, "%s BIND {%ld/%ld} {%s} {%s} {%d} {%lu} {%s}",
+ ti->ti_bind.bv_val, op->o_connid, (long) op->o_msgid,
+ suf_tcl.bv_val,
+ dn->bv_val, method, cred->bv_len, cred->bv_val);
+ Tcl_Free (suf_tcl.bv_val);
ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
code = Tcl_GlobalEval (ti->ti_ii->interp, command);