X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fdelete.c;h=80c96074808aa1559f47115010c533e484c6af5f;hb=5fcc9285fb8c549a5264921a2b61cfc40803d720;hp=e78881c22490add2577c1663305c0b8278ae95d7;hpb=dda2e4cee00cd7ea8e90820fb0a4313de028c571;p=openldap
diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index e78881c224..80c9607480 100644
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -1,43 +1,31 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999, John C. Quillan, All rights reserved.
- * Portions Copyright 2002, myinternet pty ltd. 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-2012 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 "slap.h"
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include
-#include
-
#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;
+ PERL_SET_CONTEXT( PERL_INTERPRETER );
ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
{
@@ -45,31 +33,26 @@ 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 );
- send_ldap_result( conn, op, return_code,
- NULL, NULL, NULL, NULL );
+ send_ldap_result( op, rs );
Debug( LDAP_DEBUG_ANY, "Perl DELETE\n", 0, 0, 0 );
return( 0 );