Revert "ITS#6688 enforce search ACL in back-perl"

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

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index ebdef6798901e0b15f72245e664bc5c797b16d22..9d209ebd9831080ede33c35cb576f1e41191fa0f 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-2010 The OpenLDAP Foundation.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -34,9 +34,7 @@ perl_back_search(
        char *buf;
        int i;
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -57,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;