Filled in Cyrus SASL authz/storage callbacks for all backends

[openldap] / servers / slapd / back-shell / search.c

diff --git a/servers/slapd/back-shell/search.c b/servers/slapd/back-shell/search.c
index cbc3243d2128c8eacad24955f3c233d5a7b857c4..05de6df7af576b44794bd175af205bbf76b0b6ec 100644 (file)
--- a/servers/slapd/back-shell/search.c
+++ b/servers/slapd/back-shell/search.c
@@ -1,22 +1,23 @@
 /* search.c - shell backend search function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+
 #include "slap.h"
 #include "shell.h"
 
-extern Entry   *str2entry();
-
-void
+int
 shell_back_search(
     Backend    *be,
     Connection *conn,
     Operation  *op,
     char       *base,
+    char       *nbase,
     int                scope,
     int                deref,
     int                size,
@@ -28,27 +29,25 @@ shell_back_search(
 )
 {
        struct shellinfo        *si = (struct shellinfo *) be->be_private;
-       int                     i, rc, bsize, len;
-       int                     err;
-       char                    *matched, *info;
+       int                     i;
        FILE                    *rfp, *wfp;
 
        if ( si->si_search == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "search not implemented" );
-               return;
+                   "search not implemented", NULL, NULL );
+               return( -1 );
        }
 
-       if ( (op->o_private = forkandexec( si->si_search, &rfp, &wfp ))
-           == -1 ) {
+       if ( (op->o_private = (void *) forkandexec( si->si_search, &rfp, &wfp ))
+           == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec" );
-               return;
+                   "could not fork/exec", NULL, NULL );
+               return( -1 );
        }
 
        /* write out the request to the search process */
        fprintf( wfp, "SEARCH\n" );
-       fprintf( wfp, "msgid: %d\n", op->o_msgid );
+       fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
        print_suffixes( wfp, be );
        fprintf( wfp, "base: %s\n", base );
        fprintf( wfp, "scope: %d\n", scope );
@@ -68,4 +67,5 @@ shell_back_search(
        read_and_send_results( be, conn, op, rfp, attrs, attrsonly );
 
        fclose( rfp );
+       return( 0 );
 }