X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fdelete.c;h=25566acbc6982230697fcdc97cf75cbbfe2b9f87;hb=95f014d02f967ed1b540178e4acc7e37c0d57f19;hp=8dc9bca5a591c584be8c60bff9e4ba8355d58cc5;hpb=73c87065fb84af6536b06d62bc322070fc53a1cd;p=openldap
diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index 8dc9bca5a5..25566acbc6 100644
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -1,40 +1,33 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999, John C. Quillan, All rights reserved.
+/* This work is part of OpenLDAP Software .
*
- * 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-2011 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
+ * .
*/
-#include "portable.h"
-
-#include
-/* #include
-#include
-*/
-
-#include
-#include
-
-#include "slap.h"
#include "perl_back.h"
+int
perl_back_delete(
- Backend *be,
- Connection *conn,
Operation *op,
- struct berval *dn,
- struct berval *ndn
-)
+ 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;
+#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
+ PERL_SET_CONTEXT( PERL_INTERPRETER );
+#endif
ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
{
@@ -42,33 +35,30 @@ perl_back_delete(
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 )));
PUTBACK;
+#ifdef PERL_IS_5_6
+ count = call_method("delete", G_SCALAR);
+#else
count = perl_call_method("delete", G_SCALAR);
+#endif
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,
- NULL, NULL, NULL, NULL );
-
- } else {
- send_ldap_result( conn, op, LDAP_SUCCESS,
- NULL, NULL, NULL, NULL );
- }
+ send_ldap_result( op, rs );
Debug( LDAP_DEBUG_ANY, "Perl DELETE\n", 0, 0, 0 );
return( 0 );