X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fbind.c;h=f6ae0a675c289dc3596752eaac82bf875da85127;hb=e76299c196bb93fd2e3ca7972260aa55f9c1a796;hp=755a1329b9597a902562798df3818593d6bcd5f4;hpb=04df89d9722c8e83d986809c5ab4c3c9d0b469d2;p=openldap

diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index 755a1329b9..f6ae0a675c 100644
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -1,27 +1,20 @@
 /* $OpenLDAP$ */
-/*
- *	 Copyright 1999, John C. Quillan, All rights reserved.
- *	 Portions Copyright 2002, myinternet Limited. All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *	 Redistribution and use in source and binary forms are permitted only
- *	 as authorized by the OpenLDAP Public License.	A copy of this
- *	 license is available at http://www.OpenLDAP.org/license.html or
- *	 in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include "portable.h"
-/* init.c - initialize Perl backend */
-	
-#include <stdio.h>
-
-#include "slap.h"
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include <EXTERN.h>
-#include <perl.h>
-
 #include "perl_back.h"
 
 
@@ -32,25 +25,24 @@
  **********************************************************/
 int
 perl_back_bind(
-	Backend *be,
-	Connection *conn,
 	Operation *op,
-	struct berval *dn,
-	struct berval *ndn,
-	int method,
-	struct berval *cred,
-	struct berval *edn
-)
+	SlapReply *rs )
 {
-	int return_code;
 	int count;
 
-	PerlBackend *perl_back = (PerlBackend *) be->be_private;
+	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 );	
 
 	{
@@ -58,15 +50,11 @@ perl_back_bind(
 
 		PUSHMARK(SP);
 		XPUSHs( perl_back->pb_obj_ref );
-		XPUSHs(sv_2mortal(newSVpv( dn->bv_val , 0)));
-		XPUSHs(sv_2mortal(newSVpv( cred->bv_val , cred->bv_len)));
+		XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0)));
+		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;
 
@@ -74,7 +62,7 @@ perl_back_bind(
 			croak("Big trouble in back_bind\n");
 		}
 
-		return_code = POPi;
+		rs->sr_err = POPi;
 							 
 
 		PUTBACK; FREETMPS; LEAVE;
@@ -82,11 +70,11 @@ perl_back_bind(
 
 	ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );	
 
-	Debug( LDAP_DEBUG_ANY, "Perl BIND returned 0x%04x\n", return_code, 0, 0 );
+	Debug( LDAP_DEBUG_ANY, "Perl BIND returned 0x%04x\n", rs->sr_err, 0, 0 );
 
 	/* frontend will send result on success (0) */
-	if( return_code != LDAP_SUCCESS )
-		send_ldap_result( conn, op, return_code, NULL, NULL, NULL, NULL );
+	if( rs->sr_err != LDAP_SUCCESS )
+		send_ldap_result( op, rs );
 
-	return ( return_code );
+	return ( rs->sr_err );
 }