X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fadd.c;h=9f6cdd1de255743fc2658c49201354ca64cabbfe;hb=122fa3a89538cefba69eb2c9fc7a43f62b9e3733;hp=11942e6e41111fb751bec2d0291d528469181023;hpb=fda3d6260e25f1d0b9c035b0d520b2c9d0f22e49;p=openldap

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 11942e6e41..9f6cdd1de2 100644
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -26,8 +26,9 @@ perl_back_add(
 	int len;
 	int count;
 
+	PERL_SET_CONTEXT( PERL_INTERPRETER );
 	ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
-	ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(entry2str_mutex) );
+	ldap_pvt_thread_mutex_lock( &entry2str_mutex );
 
 	{
 		dSP; ENTER; SAVETMPS;
@@ -38,11 +39,7 @@ perl_back_add(
 
 		PUTBACK;
 
-#ifdef PERL_IS_5_6
 		count = call_method("add", G_SCALAR);
-#else
-		count = perl_call_method("add", G_SCALAR);
-#endif
 
 		SPAGAIN;
 
@@ -55,7 +52,7 @@ perl_back_add(
 		PUTBACK; FREETMPS; LEAVE;
 	}
 
-	ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(entry2str_mutex) );
+	ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
 	ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );	
 
 	send_ldap_result( op, rs );