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 e16253057e177b5b36be52a2269f136f78f67179..0e1cc872276ae470b69e7865142c78c2dbf57174 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -47,23 +47,18 @@
 
 int
 ldap_back_compare(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
-    struct berval      *dn,
-    struct berval      *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 || !ldap_back_dobind( li, lc, conn, op ) ) {
+       lc = ldap_back_getconn(li, op, rs);
+       if (!lc || !ldap_back_dobind( li, lc, op, rs ) ) {
                return( -1 );
        }
 
@@ -71,46 +66,46 @@ ldap_back_compare(
         * Rewrite the compare dn, if needed
         */
 #ifdef ENABLE_REWRITE
-       switch ( rewrite_session( li->rwinfo, "compareDn", dn->bv_val, conn, &mdn.bv_val ) ) {
+       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 * )dn->bv_val;
+                       mdn.bv_val = ( char * )op->o_req_dn.bv_val;
                }
 #ifdef NEW_LOGGING
                LDAP_LOG( BACK_LDAP, DETAIL1, 
-                       "[rw] compareDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 );
+                       "[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",
-                               dn->bv_val, mdn.bv_val, "" );
+                               op->o_req_dn.bv_val, mdn.bv_val, "" );
 #endif /* !NEW_LOGGING */
                break;
                
        case REWRITE_REGEXEC_UNWILLING:
-               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-                               NULL, "Operation not allowed", NULL, NULL );
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                               "Operation not allowed" );
                return( -1 );
                
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OTHER,
-                               NULL, "Rewrite error", NULL, NULL );
+               send_ldap_error( op, rs, LDAP_OTHER,
+                               "Rewrite error" );
                return( -1 );
        }
 #else /* !ENABLE_REWRITE */
-       ldap_back_dn_massage( li, dn, &mdn, 0, 1 );
+       ldap_back_dn_massage( li, &op->o_req_dn, &mdn, 0, 1 );
        if ( mdn.bv_val == NULL ) {
                return -1;
        }
 #endif /* !ENABLE_REWRITE */
 
-       if ( ava->aa_desc == slap_schema.si_ad_objectClass ) {
-               ldap_back_map(&li->oc_map, &ava->aa_desc->ad_cname, &mapped_oc,
+       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, &ava->aa_value, &mapped_at, 
+               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 );
@@ -120,9 +115,9 @@ ldap_back_compare(
        rc = ldap_compare_ext( lc->ld, mdn.bv_val, mapped_oc.bv_val,
                &mapped_at, op->o_ctrls, NULL, &msgid );
 
-       if ( mdn.bv_val != dn->bv_val ) {
+       if ( mdn.bv_val != op->o_req_dn.bv_val ) {
                free( mdn.bv_val );
        }
        
-       return( ldap_back_op_result( li, lc, conn, op, msgid, rc, 1 ) );
+       return( ldap_back_op_result( li, lc, op, rs, msgid, rc, 1 ) );
 }