Backend * be,
Connection * conn,
Operation * op,
- char *base,
- char *nbase,
+ struct berval *base,
+ struct berval *nbase,
int scope,
int deref,
int sizelimit,
int timelimit,
Filter * filter,
- char *filterstr,
- char **attrs,
+ struct berval *filterstr,
+ AttributeName *attrs,
int attrsonly
)
{
- char *attrs_tcl = NULL, *suf_tcl, *results, *command;
+ char *attrs_tcl = NULL, *results, *command;
+ struct berval suf_tcl;
int i, err = 0, code;
struct tclinfo *ti = (struct tclinfo *) be->be_private;
- Entry *e;
+ AttributeName *an;
- if (ti->ti_search == NULL) {
+ if (ti->ti_search.bv_len == 0) {
send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
"search not implemented", NULL, NULL );
return (-1);
}
- for (i = 0; attrs != NULL && attrs[i] != NULL; i++);
- if (i > 0)
- attrs_tcl = Tcl_Merge (i, attrs);
+ for (i = 0, an = attrs; an && an->an_name.bv_val; an++, i++);
+ if (i > 0) {
+ char **sattrs = ch_malloc( (i+1) * sizeof(char *));
+ for (i = 0, an = attrs; an->an_name.bv_val; an++, i++)
+ sattrs[i] = an->an_name.bv_val;
+ sattrs[i] = NULL;
+ attrs_tcl = Tcl_Merge (i, sattrs);
+ ch_free(sattrs);
+ }
- 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) {
+ Tcl_Free (attrs_tcl);
+ send_ldap_result (conn, op, LDAP_OPERATIONS_ERROR, NULL,
+ NULL, NULL, NULL );
+ return (-1);
+ }
- command = (char *) ch_malloc (strlen (ti->ti_search) + strlen (suf_tcl)
- + strlen (base) + 40 + strlen (filterstr) + (attrs_tcl ==
- NULL ? 5
- : strlen (attrs_tcl)) + 72);
+ command = (char *) ch_malloc (ti->ti_search.bv_len + suf_tcl.bv_len
+ + base->bv_len + 60 + filterstr->bv_len +
+ (attrs_tcl == NULL ? 5 : strlen (attrs_tcl)) + 72);
sprintf (command,
- "%s SEARCH {%ld} {%s} {%s} {%d} {%d} {%d} {%d} {%s} {%d} {%s}",
- ti->ti_search, op->o_msgid, suf_tcl, base, scope, deref,
- sizelimit, timelimit, filterstr, attrsonly ? 1 : 0,
- attrs_tcl ==
- NULL ? "{all}" : attrs_tcl);
+ "%s SEARCH {%ld/%ld} {%s} {%s} {%d} {%d} {%d} {%d} {%s} {%d} {%s}",
+ ti->ti_search.bv_val, op->o_connid, (long) op->o_msgid,
+ suf_tcl.bv_val, base->bv_val, scope, deref,
+ sizelimit, timelimit, filterstr->bv_val, attrsonly ? 1 : 0,
+ attrs_tcl == NULL ? "{all}" : attrs_tcl);
Tcl_Free (attrs_tcl);
- 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);
Debug (LDAP_DEBUG_SHELL, "tcl_search_error: %s\n", results,
0, 0);
} else {
- interp_send_results (be, conn, op, results, NULL, 0);
+ interp_send_results (be, conn, op, results, attrs, 0);
}
if (err != LDAP_SUCCESS)