Fix prev commit, return generated passwd

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

diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index 4304348128e1a3bf587f1787727096fe885d75e5..b495b7ceb96eeaa3c8821dd59abb382b4d9ab083 100644 (file)
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -1,5 +1,11 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  *      Copyright 1999, John C. Quillan, All rights reserved.
+ *      Portions Copyright 2002, myinternet Limited. All rights reserved.
  *
  *      Redistribution and use in source and binary forms are permitted only
  *      as authorized by the OpenLDAP Public License.  A copy of this
@@ -7,18 +13,20 @@
  *      in file LICENSE in the top-level directory of the distribution.
  */
 
+#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"
-/* init.c - initialize shell backend */
        
 #include <stdio.h>
-/*     #include <ac/types.h>
-       #include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
 
 #include "slap.h"
+
 #include "perl_back.h"
 
 
@@ -29,52 +37,53 @@
  **********************************************************/
 int
 perl_back_bind(
-       Backend *be,
-       Connection *conn,
        Operation *op,
-       char *dn,
-       int method,
-       struct berval *cred,
-       char** edn
-)
+       SlapReply *rs )
 {
-       int return_code;
        int count;
 
-       PerlBackend *perl_back = (PerlBackend *) be->be_private;
+       PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
 
-       *edn = NULL;
+#ifdef HAVE_WIN32_ASPERL
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
+#endif
 
-       pthread_mutex_lock( &perl_interpreter_mutex );  
+       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 , 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;
 
                if (count != 1) {
-                       croak("Big trouble in back_search\n");
+                       croak("Big trouble in back_bind\n");
                }
 
-               return_code = POPi;
+               rs->sr_err = POPi;
                                                         
 
                PUTBACK; FREETMPS; LEAVE;
        }
 
-       pthread_mutex_unlock( &perl_interpreter_mutex );        
+       ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
-       Debug( LDAP_DEBUG_ANY, "Perl BIND\n", 0, 0, 0 );
-
-       return ( return_code );
-}
+       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 ( rs->sr_err );
+}