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

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

diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index 9dbf504ac4e57ea4d5a475fa9e87d117d00d7d73..192b403fd512e34415bf04c8823e1479ad2a01ed 100644 (file)
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2010 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -42,10 +42,7 @@ perl_back_bind(
                return rs->sr_err;
        }
 
-#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
-
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -53,15 +50,11 @@ perl_back_bind(
 
                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)));
                XPUSHs(sv_2mortal(newSVpv( op->orb_cred.bv_val , op->orb_cred.bv_len)));
                PUTBACK;
 
-#ifdef PERL_IS_5_6
                count = call_method("bind", G_SCALAR);
-#else
-               count = perl_call_method("bind", G_SCALAR);
-#endif
 
                SPAGAIN;