X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fcompare.c;h=372ee312f2be85cb5588142d836282335137854b;hb=474991afdf81ab7298238e157c5933164c4649a0;hp=a790c526c593fe8a11a23a5cda5176a283d6a3ef;hpb=9db008f08fbe3594e710a2554e94741d6b5c3723;p=openldap

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index a790c526c5..372ee312f2 100644
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,26 +1,22 @@
 /* $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 <http://www.openldap.org/>.
  *
- *	 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-2009 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include "portable.h"
-
-#include <stdio.h>
-/*	#include <ac/types.h>
-	#include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
-
-#include "slap.h"
 #include "perl_back.h"
+#include "lutil.h"
 
 /**********************************************************
  *
@@ -30,27 +26,24 @@
 
 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 );
 	
-	slap_strcopy( slap_strcopy( slap_strcopy( avastr,
-		ava->aa_desc->ad_cname.bv_val ), "=" ),
-		ava->aa_value.bv_val );
+	lutil_strcopy( lutil_strcopy( lutil_strcopy( avastr,
+		op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
+		op->orc_ava->aa_value.bv_val );
 
+#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
+	PERL_SET_CONTEXT( PERL_INTERPRETER );
+#endif
 	ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );	
 
 	{
@@ -58,7 +51,7 @@ 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;
 
@@ -74,8 +67,8 @@ perl_back_compare(
 			croak("Big trouble in back_compare\n");
 		}
 
-		return_code = POPi;
-							 
+		rs->sr_err = POPi;
+
 		PUTBACK; FREETMPS; LEAVE;
 	}
 
@@ -83,8 +76,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 );