X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fsearch.c;h=0d73f82ecbca5d6c43ad7bd95e4106c4f0ef2c58;hb=95f014d02f967ed1b540178e4acc7e37c0d57f19;hp=f3dfe1565b792abe6998f7bb35cb68a27ebd9160;hpb=a39cf6f93d38118375cabdf801391a5b08d81e13;p=openldap

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index f3dfe1565b..0d73f82ecb 100644
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -1,23 +1,20 @@
-/*
- *	 Copyright 1999, John C. Quillan, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *	 Redistribution and use in source and binary forms are permitted only
- *	 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.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include "portable.h"
-
-#include <stdio.h>
-/*	#include <ac/types.h>
-	#include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
-
-#include "slap.h"
 #include "perl_back.h"
 
 /**********************************************************
@@ -27,30 +24,19 @@
  **********************************************************/
 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
-	)
+	SlapReply *rs )
 {
-	char test[500];
+	PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
 	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;
 
+#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
+	PERL_SET_CONTEXT( PERL_INTERPRETER );
+#endif
 	ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );	
 
 	{
@@ -58,17 +44,24 @@ perl_back_search(
 
 		PUSHMARK(sp) ;
 		XPUSHs( perl_back->pb_obj_ref );
-		XPUSHs(sv_2mortal(newSVpv( filterstr , 0)));
-		XPUSHs(sv_2mortal(newSViv( sizelimit )));
-		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)));
+		XPUSHs(sv_2mortal(newSVpv( op->o_req_ndn.bv_val , 0)));
+		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(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)));
 		}
 		PUTBACK;
 
+#ifdef PERL_IS_5_6
+		count = call_method("search", G_ARRAY );
+#else
 		count = perl_call_method("search", G_ARRAY );
+#endif
 
 		SPAGAIN;
 
@@ -86,9 +79,27 @@ perl_back_search(
 					Debug( LDAP_DEBUG_ANY, "str2entry(%s) failed\n", buf, 0, 0 );
 
 				} else {
-					send_search_entry( be, conn, op,
-						e, attrs, attrsonly, NULL );
-							 
+					int send_entry;
+
+					if (perl_back->pb_filter_search_results)
+						send_entry = (test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE);
+					else
+						send_entry = 1;
+
+					if (send_entry) {
+						rs->sr_entry = e;
+						rs->sr_attrs = op->ors_attrs;
+						rs->sr_flags = REP_ENTRY_MODIFIABLE;
+						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;
+						}
+					}
+
 					entry_free( e );
 				}
 			}
@@ -103,22 +114,15 @@ perl_back_search(
 		 * ex stack: <$res_2> <$res_1> <0>
 		 */
 
-		return_code = POPi;
-
-
+		rs->sr_err = POPi;
 
+done:;
 		PUTBACK; FREETMPS; LEAVE;
 	}
 
 	ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );	
 
-	if( return_code != 0 ) {
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-			NULL, NULL, NULL, NULL );
+	send_ldap_result( op, rs );
 
-	} else {
-		send_ldap_result( conn, op, LDAP_SUCCESS,
-			NULL, NULL, NULL, NULL );
-	}
+	return 0;
 }
-