Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index f28605f62737d37c423fe1f56ceb3dd6e36e941f..0bd3dd6dfa219ac1d0715bb5484a32aed6860960 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.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.
@@ -41,6 +41,7 @@ perl_back_compare(
                op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
                op->orc_ava->aa_value.bv_val );
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -52,11 +53,7 @@ perl_back_compare(
                XPUSHs(sv_2mortal(newSVpv( avastr , 0)));
                PUTBACK;
 
-#ifdef PERL_IS_5_6
                count = call_method("compare", G_SCALAR);
-#else
-               count = perl_call_method("compare", G_SCALAR);
-#endif
 
                SPAGAIN;