X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fadd.c;h=9f6cdd1de255743fc2658c49201354ca64cabbfe;hb=e76299c196bb93fd2e3ca7972260aa55f9c1a796;hp=c4a54ef5fcd8c26a0f13d269fa6987fff54456a4;hpb=03679b7ce5ef9224d5ac5831a1848423b86ea594;p=openldap
diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index c4a54ef5fc..9f6cdd1de2 100644
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -1,42 +1,32 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999, John C. Quillan, All rights reserved.
- * Portions Copyright 2002, myinternet Limited. 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 "slap.h"
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include
-#include
-
#include "perl_back.h"
int
perl_back_add(
- Backend *be,
- Connection *conn,
Operation *op,
- Entry *e
-)
+ SlapReply *rs )
{
+ PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
int len;
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 );
ldap_pvt_thread_mutex_lock( &entry2str_mutex );
@@ -45,15 +35,11 @@ perl_back_add(
PUSHMARK(sp);
XPUSHs( perl_back->pb_obj_ref );
- XPUSHs(sv_2mortal(newSVpv( entry2str( e, &len ), 0 )));
+ XPUSHs(sv_2mortal(newSVpv( entry2str( op->ora_e, &len ), 0 )));
PUTBACK;
-#ifdef PERL_IS_5_6
count = call_method("add", G_SCALAR);
-#else
- count = perl_call_method("add", G_SCALAR);
-#endif
SPAGAIN;
@@ -61,7 +47,7 @@ perl_back_add(
croak("Big trouble in back_add\n");
}
- return_code = POPi;
+ rs->sr_err = POPi;
PUTBACK; FREETMPS; LEAVE;
}
@@ -69,8 +55,7 @@ perl_back_add(
ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
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 ADD\n", 0, 0, 0 );
return( 0 );