X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fsearch.c;h=c7428010f816d4c1d8da5ac6b8469d0d958c041d;hb=9547dd7a0d9fd079e6e75fb59b20a2fc661c9782;hp=548a3148705df34761f46d4b72fd26971358c3b1;hpb=6f7b00d891b5e3282924c0823052e06c62761b0c;p=openldap

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 548a314870..c7428010f8 100644
--- 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 );	
 
 	{
@@ -54,11 +55,7 @@ perl_back_search(
 		}
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("search", G_ARRAY );
-#else
-		count = perl_call_method("search", G_ARRAY );
-#endif
 
 		SPAGAIN;
 
@@ -84,16 +81,15 @@ 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;
+						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;
 }
-