Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 2e029e4af0b68d15ad7480b21effb238938f24fd..000973eb887c04af20e7ed67bb8ba03fb3564440 100644 (file)
--- 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-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -26,6 +26,7 @@ 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( &entry2str_mutex );
 
@@ -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;