]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-sql/compare.c
Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
[openldap] / servers / slapd / back-sql / compare.c
index 0f581374669f152d5084d3992e83e8389b9b0029..7d9a55bc7883869c3a5e1846c9e7b0300f2ae56e 100644 (file)
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2002 Pierangelo Masarati.
  * All rights reserved.
@@ -32,21 +32,17 @@ int
 backsql_compare( Operation *op, SlapReply *rs )
 {
        SQLHDBC                 dbh = SQL_NULL_HDBC;
-       Entry                   *e = NULL, user_entry;
+       Entry                   e = { 0 };
        Attribute               *a = NULL;
-       backsql_srch_info       bsi;
+       backsql_srch_info       bsi = { 0 };
        int                     rc;
-       AttributeName           anlist[2],
-                               *anlistp = NULL;
+       int                     manageDSAit = get_manageDSAit( op );
+       AttributeName           anlist[2];
 
-       BER_BVZERO( &user_entry.e_name );
-       BER_BVZERO( &user_entry.e_nname );
-       user_entry.e_attrs = NULL;
        Debug( LDAP_DEBUG_TRACE, "==>backsql_compare()\n", 0, 0, 0 );
 
        rs->sr_err = backsql_get_db_conn( op, &dbh );
-       if (!dbh) {
+       if ( rs->sr_err != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_compare(): "
                        "could not get connection handle - exiting\n",
                        0, 0, 0 );
@@ -56,53 +52,60 @@ backsql_compare( Operation *op, SlapReply *rs )
                goto return_results;
        }
 
-       memset( &anlist[0], 0, 2 * sizeof( AttributeName ) );
-       anlist[0].an_name = op->oq_compare.rs_ava->aa_desc->ad_cname;
-       anlist[0].an_desc = op->oq_compare.rs_ava->aa_desc;
+       anlist[ 0 ].an_name = op->oq_compare.rs_ava->aa_desc->ad_cname;
+       anlist[ 0 ].an_desc = op->oq_compare.rs_ava->aa_desc;
+       BER_BVZERO( &anlist[ 1 ].an_name );
 
        /*
-        * Try to get attr as dynamic operational
+        * Get the entry
         */
-       if ( !is_at_operational( op->oq_compare.rs_ava->aa_desc->ad_type ) ) {
-               anlistp = anlist;
-       }
-
+       bsi.bsi_e = &e;
+       rc = backsql_init_search( &bsi, &op->o_req_ndn, LDAP_SCOPE_BASE,
+                       (time_t)(-1), NULL, dbh, op, rs, anlist,
+                       ( BACKSQL_ISF_MATCHED | BACKSQL_ISF_GET_ENTRY ) );
+       switch ( rc ) {
+       case LDAP_SUCCESS:
+               break;
+
+       case LDAP_REFERRAL:
+               if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
+                               dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
+               {
+                       rs->sr_err = LDAP_SUCCESS;
+                       rs->sr_text = NULL;
+                       rs->sr_matched = NULL;
+                       if ( rs->sr_ref ) {
+                               ber_bvarray_free( rs->sr_ref );
+                               rs->sr_ref = NULL;
+                       }
+                       break;
+               }
+               /* fallthru */
 
-       rc = backsql_init_search( &bsi, &op->o_req_ndn,
-                       LDAP_SCOPE_BASE, 
-                       SLAP_NO_LIMIT, SLAP_NO_LIMIT,
-                       (time_t)(-1), NULL, dbh, op, rs, anlistp,
-                       BACKSQL_ISF_GET_ID );
-       if ( rc != LDAP_SUCCESS ) {
+       default:
                Debug( LDAP_DEBUG_TRACE, "backsql_compare(): "
                        "could not retrieve compareDN ID - no such entry\n", 
                        0, 0, 0 );
-               rs->sr_err = LDAP_NO_SUCH_OBJECT;
                goto return_results;
+       }
 
-       } else {
-               Entry   e = { 0 };
-
-               e.e_name = bsi.bsi_base_id.eid_dn;
-               e.e_nname = bsi.bsi_base_id.eid_ndn;
-
-               /* FIXME: need the whole entry (ITS#3480) */
-               if ( ! access_allowed( op, &e, slap_schema.si_ad_entry, NULL,
-                                       ACL_DISCLOSE, NULL ) ) {
-                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
-                       goto return_results;
-               }
+       if ( get_assert( op ) &&
+                       ( test_filter( op, &e, get_assertion( op ) )
+                         != LDAP_COMPARE_TRUE ) )
+       {
+               rs->sr_err = LDAP_ASSERTION_FAILED;
+               goto return_results;
        }
 
        if ( is_at_operational( op->oq_compare.rs_ava->aa_desc->ad_type ) ) {
-               SlapReply       nrs = { 0 };
+               SlapReply       nrs = { REP_SEARCH };
+               Attribute       **ap;
 
-               user_entry.e_attrs = NULL;
-               user_entry.e_name = bsi.bsi_base_id.eid_dn;
-               user_entry.e_nname = bsi.bsi_base_id.eid_ndn;
+               for ( ap = &e.e_attrs; *ap; ap = &(*ap)->a_next )
+                       ;
 
                nrs.sr_attrs = anlist;
-               nrs.sr_entry = &user_entry;
+               nrs.sr_entry = &e;
                nrs.sr_attr_flags = SLAP_OPATTRS_NO;
                nrs.sr_operational_attrs = NULL;
 
@@ -111,40 +114,27 @@ backsql_compare( Operation *op, SlapReply *rs )
                        goto return_results;
                }
                
-               user_entry.e_attrs = nrs.sr_operational_attrs;
-
-       } else {
-               bsi.bsi_e = &user_entry;
-               rc = backsql_id2entry( &bsi, &bsi.bsi_base_id );
-               if ( rc != LDAP_SUCCESS ) {
-                       Debug( LDAP_DEBUG_TRACE, "backsql_compare(): "
-                               "error %d in backsql_id2entry() "
-                               "- compare failed\n", rc, 0, 0 );
-                       rs->sr_err = rc;
-                       goto return_results;
-               }
+               *ap = nrs.sr_operational_attrs;
        }
-       e = &user_entry;
 
-       /* FIXME: need the whole entry (ITS#3480) */
-       if ( ! access_allowed( op, e, op->oq_compare.rs_ava->aa_desc, 
+       if ( ! access_allowed( op, &e, op->oq_compare.rs_ava->aa_desc,
                                &op->oq_compare.rs_ava->aa_value,
-                               ACL_COMPARE, NULL ) ) {
+                               ACL_COMPARE, NULL ) )
+       {
                rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                goto return_results;
        }
 
        rs->sr_err = LDAP_NO_SUCH_ATTRIBUTE;
-       for ( a = attrs_find( e->e_attrs, op->oq_compare.rs_ava->aa_desc );
+       for ( a = attrs_find( e.e_attrs, op->oq_compare.rs_ava->aa_desc );
                        a != NULL;
                        a = attrs_find( a->a_next, op->oq_compare.rs_ava->aa_desc ) )
        {
                rs->sr_err = LDAP_COMPARE_FALSE;
-               if ( value_find_ex( op->oq_compare.rs_ava->aa_desc,
+               if ( attr_valfind( a,
                                        SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
                                        SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-                                       a->a_nvals,
-                                       &op->oq_compare.rs_ava->aa_value,
+                                       &op->oq_compare.rs_ava->aa_value, NULL,
                                        op->o_tmpmemctx ) == 0 )
                {
                        rs->sr_err = LDAP_COMPARE_TRUE;
@@ -153,14 +143,40 @@ backsql_compare( Operation *op, SlapReply *rs )
        }
 
 return_results:;
+       switch ( rs->sr_err ) {
+       case LDAP_COMPARE_TRUE:
+       case LDAP_COMPARE_FALSE:
+               break;
+
+       default:
+               if ( !BER_BVISNULL( &e.e_nname ) &&
+                               ! access_allowed( op, &e,
+                                       slap_schema.si_ad_entry, NULL,
+                                       ACL_DISCLOSE, NULL ) )
+               {
+                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
+                       rs->sr_text = NULL;
+               }
+               break;
+       }
+
        send_ldap_result( op, rs );
 
+       if ( rs->sr_matched ) {
+               rs->sr_matched = NULL;
+       }
+
+       if ( rs->sr_ref ) {
+               ber_bvarray_free( rs->sr_ref );
+               rs->sr_ref = NULL;
+       }
+
        if ( !BER_BVISNULL( &bsi.bsi_base_id.eid_ndn ) ) {
-               (void)backsql_free_entryID( &bsi.bsi_base_id, 0 );
+               (void)backsql_free_entryID( &bsi.bsi_base_id, 0, op->o_tmpmemctx );
        }
 
-       if ( e != NULL ) {
-               entry_clean( e );
+       if ( !BER_BVISNULL( &e.e_nname ) ) {
+               backsql_entry_clean( op, &e );
        }
 
        if ( bsi.bsi_attrs != NULL ) {
@@ -171,10 +187,10 @@ return_results:;
        switch ( rs->sr_err ) {
        case LDAP_COMPARE_TRUE:
        case LDAP_COMPARE_FALSE:
-               return 0;
+               return LDAP_SUCCESS;
 
        default:
-               return 1;
+               return rs->sr_err;
        }
 }