Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 8d2b39d10042eac28d0f2b528ef0c7f00fcdf2aa..d05f71dec0b0b4e4cc589db1fbcdd351b1c5e96c 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.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-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -27,7 +27,7 @@ perl_back_modify(
        int count;
        int i;
 
-
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -64,7 +64,7 @@ perl_back_modify(
                                XPUSHs(sv_2mortal(newSVpv( mods->sm_values[i].bv_val, 0 )));
                        }
 
-                       // Fix delete attrib without value.
+                       /* Fix delete attrib without value. */
                        if ( i == 0) {
                                XPUSHs(sv_newmortal());
                        }
@@ -72,11 +72,7 @@ perl_back_modify(
 
                PUTBACK;
 
-#ifdef PERL_IS_5_6
                count = call_method("modify", G_SCALAR);
-#else
-               count = perl_call_method("modify", G_SCALAR);
-#endif
 
                SPAGAIN;