DirectoryString syntaxes must have one or more octets to be valid.

[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 36796345f2823da9499db3811eb966b2fc8bde97..62c1d4f860ede528cebf583f0133c34db98e33d6 100644 (file)
--- a/servers/slapd/back-tcl/tcl_search.c
+++ b/servers/slapd/back-tcl/tcl_search.c
@@ -1,5 +1,5 @@
-/*
- * search.c - tcl search routines
+/* $OpenLDAP$ */
+/* search.c - tcl search routines
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -7,10 +7,6 @@
  * as authorized by the OpenLDAP Public License.  A copy of this
  * license is available at http://www.OpenLDAP.org/license.html or
  * in file LICENSE in the top-level directory of the distribution.
- *
- * $Id$
- *
- * $Log$
  */
 
 #include "portable.h"
@@ -20,17 +16,19 @@
 #include "slap.h"
 #include "tcl_back.h"
 
-int tcl_back_search (
+int
+tcl_back_search (
        Backend * be,
        Connection * conn,
        Operation * op,
-       char *base,
+       const char *base,
+       const char *nbase,
        int scope,
        int deref,
        int sizelimit,
        int timelimit,
        Filter * filter,
-       char *filterstr,
+       const char *filterstr,
        char **attrs,
        int attrsonly
 )
@@ -42,44 +40,48 @@ int tcl_back_search (
 
        if (ti->ti_search == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "search not implemented");
+                       "search not implemented", NULL, NULL );
                return (-1);
        }
 
-       for ( i = 0; attrs != NULL && attrs[i] != NULL; i++ )
-               ;
+       for (i = 0; attrs != NULL && attrs[i] != NULL; i++);
        if (i > 0)
-               attrs_tcl = Tcl_Merge(i, attrs);
+               attrs_tcl = Tcl_Merge (i, attrs);
 
-       for ( i = 0; be->be_suffix[i] != NULL; i++ )
-               ;
-       suf_tcl = Tcl_Merge(i, be->be_suffix);
+       for (i = 0; be->be_suffix[i] != NULL; i++);
+       suf_tcl = Tcl_Merge (i, be->be_suffix);
 
-       command = (char *) ch_malloc (strlen(ti->ti_search) + strlen(suf_tcl)
-               + strlen(base) + 40 + strlen(filterstr) + (attrs_tcl == NULL ? 5
-               : strlen(attrs_tcl)) + 72);
-       sprintf(command, "%s SEARCH {%ld} {%s} {%s} {%d} {%d} {%d} {%d} {%s} {%d} {%s}",
+       command = (char *) ch_malloc (strlen (ti->ti_search) + strlen (suf_tcl)
+               + strlen (base) + 40 + strlen (filterstr) + (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 == 
+               sizelimit, timelimit, filterstr, attrsonly ? 1 : 0,
+               attrs_tcl ==
                NULL ? "{all}" : attrs_tcl);
-       Tcl_Free( attrs_tcl );
-       Tcl_Free( suf_tcl );
+       Tcl_Free (attrs_tcl);
+       Tcl_Free (suf_tcl);
 
-       ldap_pvt_thread_mutex_lock( &tcl_interpreter_mutex );
-       code = Tcl_GlobalEval(ti->ti_ii->interp, command);
-       results = (char *) strdup(ti->ti_ii->interp->result);
-       ldap_pvt_thread_mutex_unlock( &tcl_interpreter_mutex );
-       free(command);
+       ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
+       code = Tcl_GlobalEval (ti->ti_ii->interp, command);
+       results = (char *) ch_strdup (ti->ti_ii->interp->result);
+       ldap_pvt_thread_mutex_unlock (&tcl_interpreter_mutex);
+       free (command);
 
        if (code != TCL_OK) {
                err = LDAP_OPERATIONS_ERROR;
-               Debug(LDAP_DEBUG_ANY, "tcl_search_error: %s\n", results, 0, 0);
+               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, NULL, 0);
        }
 
        if (err != LDAP_SUCCESS)
-               send_ldap_result (conn, op, err, NULL, "internal backend error");
-       return (0);
+               send_ldap_result (conn, op, err, NULL,
+                       "internal backend error", NULL, NULL );
 
+       free (results);
+       return (err);
 }