X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fsearch.c;h=9d209ebd9831080ede33c35cb576f1e41191fa0f;hb=001f14965402aa86f3d7cd364fc781caeb603719;hp=c070b46b0a1c51ce616ba5b937f744e641185ec4;hpb=7ca24a859175b00f11e7b6e847408161f819d370;p=openldap
diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index c070b46b0a..9d209ebd98 100644
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -1,30 +1,20 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*
- * Copyright 1999, John C. Quillan, All rights reserved.
- * Portions Copyright 2002, myinternet Limited. All rights reserved.
+/* This work is part of OpenLDAP Software .
+ *
+ * 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.
*
- * 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.
+ * 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"
/**********************************************************
@@ -44,6 +34,7 @@ perl_back_search(
char *buf;
int i;
+ PERL_SET_CONTEXT( PERL_INTERPRETER );
ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
{
@@ -64,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;
@@ -96,7 +83,15 @@ perl_back_search(
if (send_entry) {
rs->sr_entry = e;
rs->sr_attrs = op->ors_attrs;
- send_search_entry( op, rs );
+ 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 );
@@ -115,8 +110,7 @@ perl_back_search(
rs->sr_err = POPi;
-
-
+done:;
PUTBACK; FREETMPS; LEAVE;
}
@@ -126,4 +120,3 @@ perl_back_search(
return 0;
}
-