X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fcompare.c;h=09ffb4d4aa937c0b3c17ba518158d47c74873c2d;hb=9dace23dec2b93bd07e20e35843149ecdaf96378;hp=ed93c411d9af32cfc4697b0b23f6c08d8996c0cc;hpb=c0f5c884297aac7b930afad98f601912c83e9e72;p=openldap

diff --git a/servers/slapd/back-shell/compare.c b/servers/slapd/back-shell/compare.c
index ed93c411d9..09ffb4d4aa 100644
--- a/servers/slapd/back-shell/compare.c
+++ b/servers/slapd/back-shell/compare.c
@@ -1,4 +1,9 @@
 /* compare.c - shell backend compare function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -10,41 +15,63 @@
 #include "slap.h"
 #include "shell.h"
 
-void
+int
 shell_back_compare(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    char	*dn,
-    Ava		*ava
-)
+    SlapReply	*rs )
 {
-	struct shellinfo	*si = (struct shellinfo *) be->be_private;
+	struct shellinfo	*si = (struct shellinfo *) op->o_bd->be_private;
+	AttributeDescription *entry = slap_schema.si_ad_entry;
+	Entry e;
 	FILE			*rfp, *wfp;
 
 	if ( si->si_compare == NULL ) {
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
+		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
 		    "compare not implemented" );
-		return;
+		return( -1 );
 	}
 
-	if ( (op->o_private = forkandexec( si->si_compare, &rfp, &wfp ))
-	    == -1 ) {
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+	e.e_id = NOID;
+	e.e_name = op->o_req_dn;
+	e.e_nname = op->o_req_ndn;
+	e.e_attrs = NULL;
+	e.e_ocflags = 0;
+	e.e_bv.bv_len = 0;
+	e.e_bv.bv_val = NULL;
+	e.e_private = NULL;
+
+	if ( ! access_allowed( op, &e,
+		entry, NULL, ACL_READ, NULL ) )
+	{
+		send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
+		return -1;
+	}
+
+	if ( (op->o_private = (void *) forkandexec( si->si_compare, &rfp, &wfp ))
+	    == (void *) -1 ) {
+		send_ldap_error( op, rs, LDAP_OTHER,
 		    "could not fork/exec" );
-		return;
+		return( -1 );
 	}
 
+	/*
+	 * FIX ME:  This should use LDIF routines so that binary
+	 *	values are properly dealt with
+	 */
+
 	/* write out the request to the compare process */
 	fprintf( wfp, "COMPARE\n" );
-	fprintf( wfp, "msgid: %d\n", op->o_msgid );
-	print_suffixes( wfp, be );
-	fprintf( wfp, "dn: %s\n", dn );
-	fprintf( wfp, "%s: %s\n", ava->ava_type, ava->ava_value.bv_val );
+	fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
+	print_suffixes( wfp, op->o_bd );
+	fprintf( wfp, "dn: %s\n", op->o_req_dn.bv_val );
+	fprintf( wfp, "%s: %s\n",
+		op->oq_compare.rs_ava->aa_desc->ad_cname.bv_val,
+		op->oq_compare.rs_ava->aa_value.bv_val /* could be binary! */ );
 	fclose( wfp );
 
 	/* read in the result and send it along */
-	read_and_send_results( be, conn, op, rfp, NULL, 0 );
+	read_and_send_results( op, rs, rfp );
 
 	fclose( rfp );
+	return( 0 );
 }