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

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

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 684f6252b78355346453b8e826d77c0c2afbca86..dcfb080c469e85efe3beaf8c0036b49a661471c4 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2009 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -25,10 +25,7 @@ perl_back_modrdn(
        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 );  
 
        {
@@ -36,19 +33,15 @@ perl_back_modrdn(
                
                PUSHMARK(sp) ;
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0 )));
-               XPUSHs(sv_2mortal(newSVpv( op->orr_newrdn.bv_val , 0 )));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , op->o_req_dn.bv_len )));
+               XPUSHs(sv_2mortal(newSVpv( op->orr_newrdn.bv_val , op->orr_newrdn.bv_len )));
                XPUSHs(sv_2mortal(newSViv( op->orr_deleteoldrdn )));
                if ( op->orr_newSup != NULL ) {
-                       XPUSHs(sv_2mortal(newSVpv( op->orr_newSup->bv_val , 0 )));
+                       XPUSHs(sv_2mortal(newSVpv( op->orr_newSup->bv_val , op->orr_newSup->bv_len )));
                }
                PUTBACK ;
 
-#ifdef PERL_IS_5_6
                count = call_method("modrdn", G_SCALAR);
-#else
-               count = perl_call_method("modrdn", G_SCALAR);
-#endif
 
                SPAGAIN ;