Minor cleanup (coverity)

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

diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index 956cc594c76411945c83b0a10bd0053868051140..9fe0391eccdf2744fb0a7dd37ff25d091c5c7ef9 100644 (file)
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -1,38 +1,31 @@
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *      Redistribution and use in source and binary forms are permitted only
- *      as authorized by the OpenLDAP Public License.  A copy of this
- *      license is available at http://www.OpenLDAP.org/license.html or
- *      in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1999-2014 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#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_delete(
-       Backend *be,
-       Connection      *conn,
        Operation       *op,
-       char    *dn
-)
+       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;
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -40,32 +33,27 @@ perl_back_delete(
 
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( dn , 0 )));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , op->o_req_dn.bv_len )));
 
                PUTBACK;
 
-               count = perl_call_method("delete", G_SCALAR);
+               count = call_method("delete", G_SCALAR);
 
                SPAGAIN;
 
                if (count != 1) {
                        croak("Big trouble in perl-back_delete\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, "Here DELETE\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_ANY, "Perl DELETE\n", 0, 0, 0 );
        return( 0 );
 }