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 0e2f570eab484947798f08ec0674ba49dfc3897a..fa6a89f21bdc2def6425a893c800a855604e83bd 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -1,4 +1,8 @@
 /* $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.
@@ -9,38 +13,32 @@
  *      in file LICENSE in the top-level directory of the distribution.
  */
 
-#include "portable.h"
-
-#include <stdio.h>
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined by both Perl and ac/localize.h */
 
-#include "slap.h"
 #ifdef HAVE_WIN32_ASPERL
 #include "asperl_undefs.h"
 #endif
 
-#include <EXTERN.h>
-#include <perl.h>
+#include "portable.h"
+
+#include <stdio.h>
+
+#include "slap.h"
 
 #include "perl_back.h"
 
 int
 perl_back_modify(
-       Backend *be,
-       Connection      *conn,
        Operation       *op,
-       struct berval   *dn,
-       struct berval   *ndn,
-       Modifications   *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;
 
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
@@ -49,7 +47,7 @@ perl_back_modify(
                
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( dn->bv_val , 0)));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0)));
 
                for (; modlist != NULL; modlist = modlist->sml_next ) {
                        Modification *mods = &modlist->sml_mod;
@@ -69,7 +67,7 @@ perl_back_modify(
                        }
 
                        
-                       XPUSHs(sv_2mortal(newSVpv( mods->sm_desc.ad_cname.bv_val, 0 )));
+                       XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val, 0 )));
 
                        for ( i = 0;
                                mods->sm_bvalues != NULL && mods->sm_bvalues[i].bv_val != NULL;
@@ -93,15 +91,14 @@ perl_back_modify(
                        croak("Big trouble in back_modify\n");
                }
                                                         
-               return_code = POPi;
+               rs->sr_err = POPi;
 
                PUTBACK; FREETMPS; LEAVE;
        }
 
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
 
-       send_ldap_result( conn, op, return_code,
-               NULL, NULL, NULL, NULL );
+       send_ldap_result( op, rs );
 
        Debug( LDAP_DEBUG_ANY, "Perl MODIFY\n", 0, 0, 0 );
        return( 0 );