X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fbind.c;h=f6ae0a675c289dc3596752eaac82bf875da85127;hb=e76299c196bb93fd2e3ca7972260aa55f9c1a796;hp=f246c2f26ee94e519e13102b443b59e62a5b24fb;hpb=7127e0887cfd03f096ecf335b36d78fdb49815cd;p=openldap
diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index f246c2f26e..f6ae0a675c 100644
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -1,26 +1,20 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999, John C. Quillan, All rights reserved.
- * Portions Copyright 2002, myinternet pty ltd. All rights reserved.
+/* This work is part of OpenLDAP Software .
*
- * 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
+ * .
*/
-#include "portable.h"
-/* init.c - initialize shell backend */
-
-#include
-/* #include
- #include
-*/
-
-#include
-#include
-
-#include "slap.h"
#include "perl_back.h"
@@ -31,37 +25,36 @@
**********************************************************/
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;
+ /* 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 );
{
dSP; ENTER; SAVETMPS;
- PUSHMARK(sp);
+ 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;
@@ -69,7 +62,7 @@ perl_back_bind(
croak("Big trouble in back_bind\n");
}
- return_code = POPi;
+ rs->sr_err = POPi;
PUTBACK; FREETMPS; LEAVE;
@@ -77,7 +70,11 @@ perl_back_bind(
ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
- Debug( LDAP_DEBUG_ANY, "Perl BIND\n", 0, 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( rs->sr_err != LDAP_SUCCESS )
+ send_ldap_result( op, rs );
- return ( return_code );
+ return ( rs->sr_err );
}