Major API change - (SLAP_OP_BLOCKS) All request parameters are

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

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 3cade31ce96a17eb9350a6e08f4f02f188c23150..0e1cc872276ae470b69e7865142c78c2dbf57174 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -1,6 +1,10 @@
 /* compare.c - ldap backend compare function */
 /* $OpenLDAP$ */
-
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* This is an altered version */
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
  * 
@@ -20,6 +24,15 @@
  *    ever read sources, credits should appear in the documentation.
  * 
  * 4. This notice may not be removed or altered.
+ *
+ *
+ *
+ * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ * 
+ * This software is being modified by Pierangelo Masarati.
+ * The previously reported conditions apply to the modified code as well.
+ * Changes in the original code are highlighted where required.
+ * Credits for the original code go to the author, Howard Chu.
  */
 
 #include "portable.h"
@@ -34,27 +47,77 @@
 
 int
 ldap_back_compare(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
-    const char *dn,
-    const char *ndn,
-       AttributeAssertion *ava
-)
+    SlapReply  *rs )
 {
-       struct ldapinfo *li = (struct ldapinfo *) be->be_private;
+       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
        struct ldapconn *lc;
+       struct berval mapped_oc, mapped_at;
+       struct berval mdn = { 0, NULL };
+       int rc;
+       ber_int_t msgid;
 
-       lc = ldap_back_getconn(li, conn, op);
-       if (!lc)
+       lc = ldap_back_getconn(li, op, rs);
+       if (!lc || !ldap_back_dobind( li, lc, op, rs ) ) {
                return( -1 );
+       }
 
-       if (!lc->bound) {
-               ldap_back_dobind(lc, op);
-               if (!lc->bound)
+       /*
+        * Rewrite the compare dn, if needed
+        */
+#ifdef ENABLE_REWRITE
+       switch ( rewrite_session( li->rwinfo, "compareDn", op->o_req_dn.bv_val, op->o_conn, &mdn.bv_val ) ) {
+       case REWRITE_REGEXEC_OK:
+               if ( mdn.bv_val == NULL ) {
+                       mdn.bv_val = ( char * )op->o_req_dn.bv_val;
+               }
+#ifdef NEW_LOGGING
+               LDAP_LOG( BACK_LDAP, DETAIL1, 
+                       "[rw] compareDn: \"%s\" -> \"%s\"\n", op->o_req_dn.bv_val, mdn.bv_val, 0 );
+#else /* !NEW_LOGGING */
+               Debug( LDAP_DEBUG_ARGS, "rw> compareDn: \"%s\" -> \"%s\"\n%s",
+                               op->o_req_dn.bv_val, mdn.bv_val, "" );
+#endif /* !NEW_LOGGING */
+               break;
+               
+       case REWRITE_REGEXEC_UNWILLING:
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                               "Operation not allowed" );
+               return( -1 );
+               
+       case REWRITE_REGEXEC_ERR:
+               send_ldap_error( op, rs, LDAP_OTHER,
+                               "Rewrite error" );
+               return( -1 );
+       }
+#else /* !ENABLE_REWRITE */
+       ldap_back_dn_massage( li, &op->o_req_dn, &mdn, 0, 1 );
+       if ( mdn.bv_val == NULL ) {
+               return -1;
+       }
+#endif /* !ENABLE_REWRITE */
+
+       if ( op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_objectClass ) {
+               ldap_back_map(&li->oc_map, &op->oq_compare.rs_ava->aa_desc->ad_cname, &mapped_oc,
+                               BACKLDAP_MAP);
+               if (mapped_oc.bv_val == NULL || mapped_oc.bv_val[0] == '\0') {
                        return( -1 );
+               }
+               
+       } else {
+               ldap_back_map(&li->at_map, &op->oq_compare.rs_ava->aa_value, &mapped_at, 
+                               BACKLDAP_MAP);
+               if (mapped_at.bv_val == NULL || mapped_at.bv_val[0] == '\0') {
+                       return( -1 );
+               }
        }
 
-       ldap_compare_s( lc->ld, dn, ava->aa_desc->ad_cname->bv_val, ava->aa_value->bv_val );
-       return( ldap_back_op_result( lc, op ) );
+       rc = ldap_compare_ext( lc->ld, mdn.bv_val, mapped_oc.bv_val,
+               &mapped_at, op->o_ctrls, NULL, &msgid );
+
+       if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+               free( mdn.bv_val );
+       }
+       
+       return( ldap_back_op_result( li, lc, op, rs, msgid, rc, 1 ) );
 }