Merge remote 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 88e45988bb94ca418dd9fec084e25840b791c2c0..f6ae0a675c289dc3596752eaac82bf875da85127 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-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -15,20 +15,6 @@
  * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include <EXTERN.h>
-#include <perl.h>
-#undef _ /* #defined by both Perl and ac/localize.h */
-
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include "portable.h"
-       
-#include <stdio.h>
-
-#include "slap.h"
-
 #include "perl_back.h"
 
 
@@ -46,10 +32,17 @@ perl_back_bind(
 
        PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
 
-#ifdef HAVE_WIN32_ASPERL
-       PERL_SET_CONTEXT( PERL_INTERPRETER );
-#endif
+       /* allow rootdn as a means to auth without the need to actually
+        * contact the proxied DSA */
+       switch ( be_rootdn_bind( op, rs ) ) {
+       case SLAP_CB_CONTINUE:
+               break;
+
+       default:
+               return rs->sr_err;
+       }
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -61,11 +54,7 @@ perl_back_bind(
                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;