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

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

diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index acd27934f873fbdf57c78324fef1a665c9b7b5ad..91bb78dab7030103c4e68c2a834a6adc701b02ab 100644 (file)
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2007 The OpenLDAP Foundation.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -25,9 +25,7 @@ perl_back_delete(
        PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
        int count;
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -35,15 +33,11 @@ perl_back_delete(
 
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0 )));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , op->o_req_dn.bv_len )));
 
                PUTBACK;
 
-#ifdef PERL_IS_5_6
                count = call_method("delete", G_SCALAR);
-#else
-               count = perl_call_method("delete", G_SCALAR);
-#endif
 
                SPAGAIN;