X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fcompare.c;h=0bd3dd6dfa219ac1d0715bb5484a32aed6860960;hb=9547dd7a0d9fd079e6e75fb59b20a2fc661c9782;hp=41e2299103709266ddc44eca00a565a057f901fd;hpb=5a01db28e301fcd691f76ecf904e96ecf9a448b8;p=openldap
diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 41e2299103..0bd3dd6dfa 100644
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,27 +1,22 @@
/* $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-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"
+#include "lutil.h"
/**********************************************************
*
@@ -31,27 +26,22 @@
int
perl_back_compare(
- Backend *be,
- Connection *conn,
Operation *op,
- struct berval *dn,
- struct berval *ndn,
- AttributeAssertion *ava
-)
+ SlapReply *rs )
{
- int return_code;
int count;
- char *avastr, *ptr;
+ char *avastr;
- PerlBackend *perl_back = (PerlBackend *)be->be_private;
+ PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
- avastr = ch_malloc( ava->aa_desc->ad_cname.bv_len + 1 +
- ava->aa_value.bv_len + 1 );
+ avastr = ch_malloc( op->orc_ava->aa_desc->ad_cname.bv_len + 1 +
+ op->orc_ava->aa_value.bv_len + 1 );
lutil_strcopy( lutil_strcopy( lutil_strcopy( avastr,
- ava->aa_desc->ad_cname.bv_val ), "=" ),
- ava->aa_value.bv_val );
+ op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
+ op->orc_ava->aa_value.bv_val );
+ PERL_SET_CONTEXT( PERL_INTERPRETER );
ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
{
@@ -59,15 +49,11 @@ perl_back_compare(
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)));
XPUSHs(sv_2mortal(newSVpv( avastr , 0)));
PUTBACK;
-#ifdef PERL_IS_5_6
count = call_method("compare", G_SCALAR);
-#else
- count = perl_call_method("compare", G_SCALAR);
-#endif
SPAGAIN;
@@ -75,8 +61,8 @@ perl_back_compare(
croak("Big trouble in back_compare\n");
}
- return_code = POPi;
-
+ rs->sr_err = POPi;
+
PUTBACK; FREETMPS; LEAVE;
}
@@ -84,8 +70,7 @@ perl_back_compare(
ch_free( avastr );
- send_ldap_result( conn, op, return_code,
- NULL, NULL, NULL, NULL );
+ send_ldap_result( op, rs );
Debug( LDAP_DEBUG_ANY, "Perl COMPARE\n", 0, 0, 0 );