Fix cursor initialization, scope IDs

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

diff --git a/servers/slapd/back-tcl/tcl_search.c b/servers/slapd/back-tcl/tcl_search.c
index f9944a56d378f2f76299b51a6239c9f3fc515020..9a06214bc3697a1c51822d265d8cca08220d1611 100644 (file)
--- a/servers/slapd/back-tcl/tcl_search.c
+++ b/servers/slapd/back-tcl/tcl_search.c
@@ -18,59 +18,46 @@
 
 int
 tcl_back_search (
-       Backend * be,
-       Connection * conn,
        Operation * op,
-       struct berval *base,
-       struct berval *nbase,
-       int scope,
-       int deref,
-       int sizelimit,
-       int timelimit,
-       Filter * filter,
-       struct berval *filterstr,
-       AttributeName *attrs,
-       int attrsonly
-)
+       SlapReply * rs )
 {
        char *attrs_tcl = NULL, *results, *command;
        struct berval suf_tcl;
-       int i, err = 0, code;
-       struct tclinfo *ti = (struct tclinfo *) be->be_private;
+       int i, code;
+       struct tclinfo *ti = (struct tclinfo *) op->o_bd->be_private;
        AttributeName *an;
 
        if (ti->ti_search.bv_len == 0) {
-               send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "search not implemented", NULL, NULL );
+               send_ldap_error (op, rs, LDAP_UNWILLING_TO_PERFORM,
+                       "search not implemented" );
                return (-1);
        }
 
-       for (i = 0, an = attrs; an && an->an_name.bv_val; an++, i++);
+       for (i = 0, an = op->oq_search.rs_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++)
+               for (i = 0, an = op->oq_search.rs_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);
        }
 
-       if (tcl_merge_bvlist (be->be_suffix, &suf_tcl) == NULL) {
+       if (tcl_merge_bvlist (op->o_bd->be_suffix, &suf_tcl) == NULL) {
                Tcl_Free (attrs_tcl);
-               send_ldap_result (conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                       NULL, NULL, NULL );
+               send_ldap_error (op, rs, LDAP_OTHER, NULL);
                return (-1);
        }
 
        command = (char *) ch_malloc (ti->ti_search.bv_len + suf_tcl.bv_len
-               + base->bv_len + 40 + filterstr->bv_len + 
+               + op->o_req_dn.bv_len + 60 + op->oq_search.rs_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.bv_val, (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);
+               "%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, op->o_req_dn.bv_val, op->oq_search.rs_scope, op->oq_search.rs_deref,
+               op->oq_search.rs_slimit, op->oq_search.rs_tlimit, op->oq_search.rs_filterstr.bv_val,
+               op->oq_search.rs_attrsonly ? 1 : 0, attrs_tcl == NULL ? "{all}" : attrs_tcl);
        Tcl_Free (attrs_tcl);
        Tcl_Free (suf_tcl.bv_val);
 
@@ -81,17 +68,18 @@ tcl_back_search (
        free (command);
 
        if (code != TCL_OK) {
-               err = LDAP_OPERATIONS_ERROR;
+               rs->sr_err = LDAP_OTHER;
                Debug (LDAP_DEBUG_SHELL, "tcl_search_error: %s\n", results,
                        0, 0);
        } else {
-               interp_send_results (be, conn, op, results, attrs, 0);
+               interp_send_results (op, rs, results );
        }
 
-       if (err != LDAP_SUCCESS)
-               send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL, NULL );
+       if (rs->sr_err != LDAP_SUCCESS) {
+               rs->sr_text = "internal backend error";
+               send_ldap_result (op, rs );
+       }
 
        free (results);
-       return (err);
+       return (rs->sr_err);
 }