Remove lint

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

diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index 53acb19945995b639731f51031b38aeff3dffd0b..e07d3abf18368a932dec48537ef713f49a341f52 100644 (file)
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -1,5 +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
@@ -10,21 +12,24 @@
 #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
 perl_back_delete(
        Backend *be,
        Connection      *conn,
        Operation       *op,
-       char    *dn
+       struct berval   *dn,
+       struct berval   *ndn
 )
 {
        int len;
@@ -40,11 +45,15 @@ perl_back_delete(
 
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( dn , 0 )));
+               XPUSHs(sv_2mortal(newSVpv( dn->bv_val , 0 )));
 
                PUTBACK;
 
+#ifdef PERL_IS_5_6
+               count = call_method("delete", G_SCALAR);
+#else
                count = perl_call_method("delete", G_SCALAR);
+#endif
 
                SPAGAIN;
 
@@ -59,15 +68,9 @@ perl_back_delete(
 
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
-       if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+       send_ldap_result( conn, op, return_code,
                        NULL, NULL, NULL, NULL );
 
-       } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS,
-                       NULL, NULL, NULL, NULL );
-       }
-
-       Debug( LDAP_DEBUG_ANY, "Here DELETE\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_ANY, "Perl DELETE\n", 0, 0, 0 );
        return( 0 );
 }