X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fdelete.c;h=24fa7a34892f0b1990c2e10e2763e873e8ac9806;hb=329bd66d6ab650e052929af9ccc35bb7416bd87d;hp=53acb19945995b639731f51031b38aeff3dffd0b;hpb=73276e84ae32e9e148197971d1d6729739980353;p=openldap
diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index 53acb19945..24fa7a3489 100644
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -1,37 +1,43 @@
-/*
- * Copyright 1999, John C. Quillan, All rights reserved.
+/* $OpenLDAP$ */
+/* 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-2003 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
+#include
+#undef _ /* #defined by both Perl and ac/localize.h */
+
+#ifdef HAVE_WIN32_ASPERL
+#include "asperl_undefs.h"
+#endif
+
#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,
- 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;
ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
@@ -40,34 +46,31 @@ 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 , 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, "Here DELETE\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "Perl DELETE\n", 0, 0, 0 );
return( 0 );
}