Fix prev commit, return generated passwd

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

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 1542956c88a6adcc0ba2bfe8daf1dab50fa4f5bb..704d25b3f0bd7f8b36f9d8ed7dc0f64f47b554e6 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.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
@@ -20,72 +26,66 @@
  *
  */
 
+#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_modrdn(
-       Backend *be,
-       Connection      *conn,
        Operation       *op,
-       char    *dn,
-       char    *newrdn,
-       int             deleteoldrdn,
-       char    *newSuperior
-)
+       SlapReply       *rs )
 {
-       int len;
+       PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
        int count;
-       int return_code;
-
-       PerlBackend *perl_back = (PerlBackend *) be->be_private;
 
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
                dSP; ENTER; SAVETMPS;
-
+               
                PUSHMARK(sp) ;
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( dn , 0 )));
-               XPUSHs(sv_2mortal(newSVpv( newrdn , 0 )));
-               XPUSHs(sv_2mortal(newSViv( deleteoldrdn )));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0 )));
+               XPUSHs(sv_2mortal(newSVpv( op->orr_newrdn.bv_val , 0 )));
+               XPUSHs(sv_2mortal(newSViv( op->orr_deleteoldrdn )));
+               if ( op->orr_newSup != NULL ) {
+                       XPUSHs(sv_2mortal(newSVpv( op->orr_newSup->bv_val , 0 )));
+               }
                PUTBACK ;
 
+#ifdef PERL_IS_5_6
+               count = call_method("modrdn", G_SCALAR);
+#else
                count = perl_call_method("modrdn", G_SCALAR);
+#endif
 
                SPAGAIN ;
 
                if (count != 1) {
-                       croak("Big trouble in back_search\n") ;
+                       croak("Big trouble in back_modrdn\n") ;
                }
                                                         
-               return_code = POPi;
+               rs->sr_err = POPi;
 
                PUTBACK; FREETMPS; LEAVE ;
        }
 
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
-
-       if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-
-       } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
-       }
+       
+       send_ldap_result( op, rs );
 
        Debug( LDAP_DEBUG_ANY, "Perl MODRDN\n", 0, 0, 0 );
        return( 0 );
 }
-
-