Fix prev commit, return generated passwd

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

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 064701d1f6bbf0ef39989399a9b543dc52c49672..fa6a89f21bdc2def6425a893c800a855604e83bd 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.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,49 +13,46 @@
  *      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"
 
 #include <stdio.h>
-/* #include <ac/types.h>
-       #include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
 
 #include "slap.h"
+
 #include "perl_back.h"
 
 int
 perl_back_modify(
-       Backend *be,
-       Connection      *conn,
        Operation       *op,
-       char    *dn,
-       LDAPModList     *modlist
-)
+       SlapReply       *rs )
 {
-       char test[500];
-       int return_code;
+       PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
+       Modifications *modlist = op->orm_modlist;
        int count;
        int i;
-       int err = 0;
-       char *matched = NULL, *info = NULL;
 
-       PerlBackend *perl_back = (PerlBackend *)be->be_private;
 
-       pthread_mutex_lock( &perl_interpreter_mutex );  
+       ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
                dSP; ENTER; SAVETMPS;
-
+               
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0)));
 
-               for (; modlist != NULL; modlist = modlist->ml_next ) {
-                       LDAPMod *mods = &modlist->ml_mod;
+               for (; modlist != NULL; modlist = modlist->sml_next ) {
+                       Modification *mods = &modlist->sml_mod;
 
-                       switch ( mods->mod_op & ~LDAP_MOD_BVALUES ) {
+                       switch ( mods->sm_op & ~LDAP_MOD_BVALUES ) {
                        case LDAP_MOD_ADD:
                                XPUSHs(sv_2mortal(newSVpv("ADD", 0 )));
                                break;
@@ -63,40 +66,39 @@ perl_back_modify(
                                break;
                        }
 
-
-                       XPUSHs(sv_2mortal(newSVpv( mods->mod_type, 0 )));
+                       
+                       XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val, 0 )));
 
                        for ( i = 0;
-                               mods->mod_bvalues != NULL && mods->mod_bvalues[i] != NULL;
+                               mods->sm_bvalues != NULL && mods->sm_bvalues[i].bv_val != NULL;
                                i++ )
                        {
-                               XPUSHs(sv_2mortal(newSVpv( mods->mod_bvalues[i]->bv_val, 0 )));
+                               XPUSHs(sv_2mortal(newSVpv( mods->sm_bvalues[i].bv_val, 0 )));
                        }
                }
 
                PUTBACK;
 
+#ifdef PERL_IS_5_6
+               count = call_method("modify", G_SCALAR);
+#else
                count = perl_call_method("modify", G_SCALAR);
+#endif
 
                SPAGAIN;
 
                if (count != 1) {
-                       croak("Big trouble in back_search\n");
+                       croak("Big trouble in back_modify\n");
                }
                                                         
-               return_code = POPi;
+               rs->sr_err = POPi;
 
                PUTBACK; FREETMPS; LEAVE;
        }
 
-       pthread_mutex_unlock( &perl_interpreter_mutex );
-
-       if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
+       ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
 
-       } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
-       }
+       send_ldap_result( op, rs );
 
        Debug( LDAP_DEBUG_ANY, "Perl MODIFY\n", 0, 0, 0 );
        return( 0 );