Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-sock / compare.c

diff --git a/servers/slapd/back-sock/compare.c b/servers/slapd/back-sock/compare.c
index 71fd6f17789319fb4d46f137e5f8f8002cd9c489..bb02fae58474f8f8ad3a893c7f7f826fa402208c 100644 (file)
--- a/servers/slapd/back-sock/compare.c
+++ b/servers/slapd/back-sock/compare.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,6 +27,7 @@
 
 #include "slap.h"
 #include "back-sock.h"
+#include "ldif.h"
 
 int
 sock_back_compare(
@@ -37,6 +38,7 @@ sock_back_compare(
        AttributeDescription *entry = slap_schema.si_ad_entry;
        Entry e;
        FILE                    *fp;
+       char *text;
 
        e.e_id = NOID;
        e.e_name = op->o_req_dn;
@@ -48,7 +50,7 @@ sock_back_compare(
        e.e_private = NULL;
 
        if ( ! access_allowed( op, &e,
-               entry, NULL, ACL_READ, NULL ) )
+               entry, NULL, ACL_COMPARE, NULL ) )
        {
                send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
                return -1;
@@ -60,21 +62,23 @@ sock_back_compare(
                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( fp, "COMPARE\n" );
        fprintf( fp, "msgid: %ld\n", (long) op->o_msgid );
        sock_print_conn( fp, op->o_conn, si );
        sock_print_suffixes( fp, op->o_bd );
        fprintf( fp, "dn: %s\n", op->o_req_dn.bv_val );
-       fprintf( fp, "%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( fp );
+       /* could be binary */
+       text = ldif_put_wrap( LDIF_PUT_VALUE,
+               op->orc_ava->aa_desc->ad_cname.bv_val,
+               op->orc_ava->aa_value.bv_val,
+               op->orc_ava->aa_value.bv_len, LDIF_LINE_WIDTH_MAX );
+       if ( text ) {
+               fprintf( fp, "%s\n", text );
+               ber_memfree( text );
+       } else {
+               fprintf( fp, "\n\n" );
+       }
 
        /* read in the result and send it along */
        sock_read_and_send_results( op, rs, fp );