X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fsearch.c;h=0d73f82ecbca5d6c43ad7bd95e4106c4f0ef2c58;hb=95f014d02f967ed1b540178e4acc7e37c0d57f19;hp=54c3d807efa4af74b976188ffdcb559910e44e6c;hpb=dda2e4cee00cd7ea8e90820fb0a4313de028c571;p=openldap
diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 54c3d807ef..0d73f82ecb 100644
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -1,26 +1,20 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999, John C. Quillan, All rights reserved.
- * Portions Copyright 2002, myinternet pty ltd. All rights reserved.
+/* This work is part of OpenLDAP Software .
*
- * 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
+ * .
*/
-#include "portable.h"
-
-#include
-
-#include "slap.h"
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include
-#include
-
#include "perl_back.h"
/**********************************************************
@@ -30,32 +24,19 @@
**********************************************************/
int
perl_back_search(
- Backend *be,
- Connection *conn,
Operation *op,
- struct berval *base,
- struct berval *nbase,
- int scope,
- int deref,
- int sizelimit,
- int timelimit,
- Filter *filter,
- struct berval *filterstr,
- AttributeName *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 );
{
@@ -63,15 +44,15 @@ perl_back_search(
PUSHMARK(sp) ;
XPUSHs( perl_back->pb_obj_ref );
- XPUSHs(sv_2mortal(newSVpv( nbase->bv_val , 0)));
- XPUSHs(sv_2mortal(newSViv( scope )));
- XPUSHs(sv_2mortal(newSViv( deref )));
- XPUSHs(sv_2mortal(newSViv( sizelimit )));
- XPUSHs(sv_2mortal(newSViv( timelimit )));
- XPUSHs(sv_2mortal(newSVpv( filterstr->bv_val , 0)));
- XPUSHs(sv_2mortal(newSViv( attrsonly )));
-
- for ( an = attrs; an && an->an_name.bv_val; an++ ) {
+ 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;
@@ -101,13 +82,22 @@ perl_back_search(
int send_entry;
if (perl_back->pb_filter_search_results)
- send_entry = (test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE);
+ send_entry = (test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE);
else
send_entry = 1;
if (send_entry) {
- send_search_entry( be, conn, op,
- e, attrs, attrsonly, NULL );
+ 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 );
@@ -124,18 +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 );
- send_ldap_result( conn, op, return_code,
- NULL, NULL, NULL, NULL );
+ send_ldap_result( op, rs );
return 0;
}
-