More ACL to dn="" bug fixing... and add test006-acl check

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

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index c2f6ff19e7e8d36ecdc8c0124caef5b096fa305e..32db575665b898aab01540d95a1e1b870dcd77b8 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -1,6 +1,7 @@
 /* $OpenLDAP$ */
 /*
  *      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
@@ -24,14 +25,15 @@
 #include "portable.h"
 
 #include <stdio.h>
-/*     #include <ac/types.h>
-       #include <ac/socket.h>
-*/
+
+#include "slap.h"
+#ifdef HAVE_WIN32_ASPERL
+#include "asperl_undefs.h"
+#endif
 
 #include <EXTERN.h>
 #include <perl.h>
 
-#include "slap.h"
 #include "perl_back.h"
 
 int
@@ -39,11 +41,13 @@ perl_back_modrdn(
        Backend *be,
        Connection      *conn,
        Operation       *op,
-       const char      *dn,
-       const char      *ndn,
-       const char      *newrdn,
+       struct berval   *dn,
+       struct berval   *ndn,
+       struct berval   *newrdn,
+       struct berval   *nnewrdn,
        int             deleteoldrdn,
-       const char      *newSuperior
+       struct berval   *newSuperior,
+       struct berval   *nnewSuperior
 )
 {
        int len;
@@ -59,20 +63,24 @@ perl_back_modrdn(
                
                PUSHMARK(sp) ;
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( dn , 0 )));
-               XPUSHs(sv_2mortal(newSVpv( newrdn , 0 )));
+               XPUSHs(sv_2mortal(newSVpv( dn->bv_val , 0 )));
+               XPUSHs(sv_2mortal(newSVpv( newrdn->bv_val , 0 )));
                XPUSHs(sv_2mortal(newSViv( deleteoldrdn )));
                if ( newSuperior != NULL ) {
-                       XPUSHs(sv_2mortal(newSVpv( newSuperior , 0 )));
+                       XPUSHs(sv_2mortal(newSVpv( newSuperior->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;
@@ -82,17 +90,9 @@ perl_back_modrdn(
 
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
        
-       if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                       NULL, NULL, NULL, NULL );
-
-       } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS,
-                       NULL, NULL, NULL, NULL );
-       }
+       send_ldap_result( conn, op, return_code,
+               NULL, NULL, NULL, NULL );
 
        Debug( LDAP_DEBUG_ANY, "Perl MODRDN\n", 0, 0, 0 );
        return( 0 );
 }
-
-