X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fcompare.c;h=0bd3dd6dfa219ac1d0715bb5484a32aed6860960;hb=9547dd7a0d9fd079e6e75fb59b20a2fc661c9782;hp=9ade62f55d43c3ab407fd1cbc0982a5906e5f68c;hpb=b7beec16639919fa80f76f0e72db9afde77d32be;p=openldap

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 9ade62f55d..0bd3dd6dfa 100644
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,24 +1,22 @@
-/*
- *	 Copyright 1999, John C. Quillan, All rights reserved.
+/* $OpenLDAP$ */
+/* 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-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
+ * <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"
 
 /**********************************************************
  *
@@ -26,58 +24,55 @@
  *
  **********************************************************/
 
+int
 perl_back_compare(
-	Backend	*be,
-	Connection	*conn,
 	Operation	*op,
-	char	*dn,
-	Ava		*ava
-)
+	SlapReply	*rs )
 {
-	int return_code;
 	int count;
+	char *avastr;
 
-	PerlBackend *perl_back = (PerlBackend *)be->be_private;
+	PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
 
-	send_ldap_result( conn, op, LDAP_NOT_SUPPORTED,
-		"", "not yet implemented" );
+	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,
+		op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
+		op->orc_ava->aa_value.bv_val );
 
-#ifdef notdef
-	pthread_mutex_lock( &perl_interpreter_mutex );	
+	PERL_SET_CONTEXT( PERL_INTERPRETER );
+	ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );	
 
 	{
 		dSP; ENTER; SAVETMPS;
 
 		PUSHMARK(sp);
-		XPUSHs( perl_back->obj_ref );
-		XPUSHs(sv_2mortal(newSVpv( dn , 0)));
-		/* XPUSHs(sv_2mortal(newSVpv( cred->bv_val , cred->bv_len))); */
+		XPUSHs( perl_back->pb_obj_ref );
+		XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0)));
+		XPUSHs(sv_2mortal(newSVpv( avastr , 0)));
 		PUTBACK;
 
-		count = perl_call_method("bind", G_SCALAR);
+		count = call_method("compare", G_SCALAR);
 
 		SPAGAIN;
 
 		if (count != 1) {
-			croak("Big trouble in back_search\n");
+			croak("Big trouble in back_compare\n");
 		}
 
-		return_code = POPi;
-							 
+		rs->sr_err = POPi;
+
 		PUTBACK; FREETMPS; LEAVE;
 	}
 
-	pthread_mutex_unlock( &perl_interpreter_mutex );	
+	ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );	
 
-	if( return_code != 0 ) {
-		send_ldap_result( conn, op, LDAP_COMPARE_TRUE, "", "" );
+	ch_free( avastr );
 
-	} else {
-		send_ldap_result( conn, op, LDAP_COMPARE_FALSE, "", "" );
-	}
-#endif
+	send_ldap_result( op, rs );
 
-	Debug( LDAP_DEBUG_ANY, "Here BIND\n", 0, 0, 0 );
+	Debug( LDAP_DEBUG_ANY, "Perl COMPARE\n", 0, 0, 0 );
 
 	return (0);
 }