Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 565402172c73e4dc106af49259a8da2ce964b6c8..220e89c77987b78ad78d7b5e57880a8a91379051 100644 (file)
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -34,6 +34,7 @@ perl_back_search(
        char *buf;
        int i;
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -41,24 +42,20 @@ perl_back_search(
 
                PUSHMARK(sp) ;
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( op->o_req_ndn.bv_val , 0)));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_ndn.bv_val , op->o_req_ndn.bv_len)));
                XPUSHs(sv_2mortal(newSViv( op->ors_scope )));
                XPUSHs(sv_2mortal(newSViv( op->ors_deref )));
                XPUSHs(sv_2mortal(newSViv( op->ors_slimit )));
                XPUSHs(sv_2mortal(newSViv( op->ors_tlimit )));
-               XPUSHs(sv_2mortal(newSVpv( op->ors_filterstr.bv_val , 0)));
+               XPUSHs(sv_2mortal(newSVpv( op->ors_filterstr.bv_val , op->ors_filterstr.bv_len)));
                XPUSHs(sv_2mortal(newSViv( op->ors_attrsonly )));
 
                for ( an = op->ors_attrs; an && an->an_name.bv_val; an++ ) {
-                       XPUSHs(sv_2mortal(newSVpv( an->an_name.bv_val , 0)));
+                       XPUSHs(sv_2mortal(newSVpv( an->an_name.bv_val , an->an_name.bv_len)));
                }
                PUTBACK;
 
-#ifdef PERL_IS_5_6
                count = call_method("search", G_ARRAY );
-#else
-               count = perl_call_method("search", G_ARRAY );
-#endif
 
                SPAGAIN;
 
@@ -84,17 +81,16 @@ perl_back_search(
                                                send_entry = 1;
 
                                        if (send_entry) {
-                                               int     rc;
-
                                                rs->sr_entry = e;
                                                rs->sr_attrs = op->ors_attrs;
                                                rs->sr_flags = REP_ENTRY_MODIFIABLE;
-                                               rc = send_search_entry( op, rs );
-                                               switch ( rc ) {
-                                               case SLAPD_SEND_SIZELIMIT:
-                                                       rs->sr_entry = NULL;
-                                                       rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
-                                                       goto done2;
+                                               rs->sr_err = LDAP_SUCCESS;
+                                               rs->sr_err = send_search_entry( op, rs );
+                                               rs->sr_flags = 0;
+                                               rs->sr_attrs = NULL;
+                                               rs->sr_entry = NULL;
+                                               if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) {
+                                                       goto done;
                                                }
                                        }
 
@@ -124,4 +120,3 @@ done:;
 
        return 0;
 }
-