Add a default case with assert() just in case.

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

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index e85435fe65dff25ed78e931e36fd85e89d185218..1e71424d67163051af324aee20dc263a521667ee 100644 (file)
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *      Copyright 1999, John C. Quillan, All rights reserved.
  *
@@ -27,30 +28,33 @@
  **********************************************************/
 int
 perl_back_search(
-        Backend *be,
-        Connection *conn,
-        Operation *op,
-        char *base,
-        int scope,
-        int deref,
-        int sizelimit,
-        int timelimit,
-        Filter *filter,
-        char *filterstr,
-        char **attrs,
-        int attrsonly
-)
+       Backend *be,
+       Connection *conn,
+       Operation *op,
+       const char *base,
+       const char *nbase,
+       int scope,
+       int deref,
+       int sizelimit,
+       int timelimit,
+       Filter *filter,
+       const char *filterstr,
+       AttributeName *attrs,
+       int attrsonly
+       )
 {
        char test[500];
        int count ;
        int err = 0;
        char *matched = NULL, *info = NULL;
        PerlBackend *perl_back = (PerlBackend *)be->be_private;
+       AttributeName *an;
        Entry   *e;
        char *buf;
        int i;
+       int return_code;
 
-       pthread_mutex_lock( &perl_interpreter_mutex );  
+       ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
                dSP; ENTER; SAVETMPS;
@@ -62,41 +66,62 @@ perl_back_search(
                XPUSHs(sv_2mortal(newSViv( timelimit )));
                XPUSHs(sv_2mortal(newSViv( attrsonly )));
 
-               for ( i = 0; attrs != NULL && attrs[i] != NULL; i++ ) {
-                       XPUSHs(sv_2mortal(newSVpv( attrs[i] , 0)));
+               for ( an = attrs; an && an->an_name.bv_val; an++ ) {
+                       XPUSHs(sv_2mortal(newSVpv( an->an_name.bv_val , 0)));
                }
                PUTBACK;
 
-               count = perl_call_method("search", G_SCALAR);
+               count = perl_call_method("search", G_ARRAY );
 
                SPAGAIN;
 
-               if (count != 1) {
+               if (count < 1) {
                        croak("Big trouble in back_search\n") ;
                }
+
+               if ( count > 1 ) {
                                                         
-               printf( "Before send search entry\n");
-               buf = POPp;
-
-               if ( (e = str2entry( buf )) == NULL ) {
-                       Debug( LDAP_DEBUG_ANY, "str2entry(%s) failed\n", buf, 0, 0 );
-
-               } else {
-                       send_search_entry( be,
-                               conn,
-                               op,
-                               e,
-                               attrs,
-                               attrsonly );
+                       for ( i = 1; i < count; i++ ) {
+
+                               buf = POPp;
+
+                               if ( (e = str2entry( buf )) == NULL ) {
+                                       Debug( LDAP_DEBUG_ANY, "str2entry(%s) failed\n", buf, 0, 0 );
+
+                               } else {
+                                       send_search_entry( be, conn, op,
+                                               e, attrs, attrsonly, NULL );
                                                         
-                       entry_free( e );
+                                       entry_free( e );
+                               }
+                       }
                }
 
+               /*
+                * We grab the return code last because the stack comes
+                * from perl in reverse order. 
+                *
+                * ex perl: return ( 0, $res_1, $res_2 );
+                *
+                * ex stack: <$res_2> <$res_1> <0>
+                */
+
+               return_code = POPi;
+
+
+
                PUTBACK; FREETMPS; LEAVE;
        }
 
-       pthread_mutex_unlock( &perl_interpreter_mutex );        
+       ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
-       send_ldap_result( conn, op, err, matched, info );
+       if( return_code != 0 ) {
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
+
+       } else {
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
+       }
 }