X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcompare.c;h=7615323a5c0375808e6aca118361f9ca19e67669;hb=6e602b549420181bfe6ad55d863963a5b11544d1;hp=81e3e9f54e206783b54226bbe957f3b67fe4b4fa;hpb=acc32b9d9e731cf51d5f84ef392e9aa0c17e89de;p=openldap diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c index 81e3e9f54e..7615323a5c 100644 --- a/servers/slapd/compare.c +++ b/servers/slapd/compare.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -19,39 +19,40 @@ #include #include +#include #include "ldap_pvt.h" #include "slap.h" +#ifdef LDAP_SLAPI +#include "slapi.h" +#endif static int compare_entry( - Connection *conn, Operation *op, Entry *e, AttributeAssertion *ava ); int do_compare( - Connection *conn, - Operation *op + Operation *op, + SlapReply *rs ) { Entry *entry = NULL; - Entry *fentry = NULL; struct berval dn = { 0, NULL }; - struct berval pdn = { 0, NULL }; - struct berval ndn = { 0, NULL }; struct berval desc = { 0, NULL }; struct berval value = { 0, NULL }; - AttributeAssertion ava = { 0 }; - Backend *be; - int rc = LDAP_SUCCESS; - const char *text = NULL; + AttributeAssertion ava = { NULL, { 0, NULL } }; int manageDSAit; +#ifdef LDAP_SLAPI + Slapi_PBlock *pb = op->o_pb; +#endif + ava.aa_desc = NULL; #ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, "do_compare: conn %d\n", conn->c_connid, 0, 0 ); + LDAP_LOG( OPERATION, ENTRY, "do_compare: conn %d\n", op->o_connid, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 ); #endif @@ -70,148 +71,139 @@ do_compare( if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ERR, - "do_compare: conn %d ber_scanf failed\n", conn->c_connid, 0, 0 ); + "do_compare: conn %d ber_scanf failed\n", op->o_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); #endif - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); + send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" ); return SLAPD_DISCONNECT; } if ( ber_scanf( op->o_ber, "{mm}", &desc, &value ) == LBER_ERROR ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ERR, - "do_compare: conn %d get ava failed\n", conn->c_connid, 0, 0 ); + "do_compare: conn %d get ava failed\n", op->o_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_compare: get ava failed\n", 0, 0, 0 ); #endif - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); - rc = SLAPD_DISCONNECT; - goto cleanup; + send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" ); + return SLAPD_DISCONNECT; } if ( ber_scanf( op->o_ber, /*{*/ "}" ) == LBER_ERROR ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ERR, - "do_compare: conn %d ber_scanf failed\n", conn->c_connid, 0, 0 ); + "do_compare: conn %d ber_scanf failed\n", op->o_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); #endif - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); - rc = SLAPD_DISCONNECT; - goto cleanup; + send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" ); + return SLAPD_DISCONNECT; } - if( ( rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { + if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, INFO, - "do_compare: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 ); + "do_compare: conn %d get_ctrls failed\n", op->o_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_compare: get_ctrls failed\n", 0, 0, 0 ); #endif goto cleanup; } - rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn ); - if( rc != LDAP_SUCCESS ) { + rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx ); + if( rs->sr_err != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, INFO, "do_compare: conn %d invalid dn (%s)\n", - conn->c_connid, dn.bv_val, 0 ); + op->o_connid, dn.bv_val, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_compare: invalid dn (%s)\n", dn.bv_val, 0, 0 ); #endif - send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL, - "invalid DN", NULL, NULL ); + send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" ); goto cleanup; } - rc = slap_bv2ad( &desc, &ava.aa_desc, &text ); - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); + rs->sr_err = slap_bv2ad( &desc, &ava.aa_desc, &rs->sr_text ); + if( rs->sr_err != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); goto cleanup; } - rc = value_validate_normalize( ava.aa_desc, SLAP_MR_EQUALITY, - &value, &ava.aa_value, &text ); - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); + rs->sr_err = asserted_value_validate_normalize( ava.aa_desc, + ava.aa_desc->ad_type->sat_equality, + SLAP_MR_EQUALITY|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX, + &value, &ava.aa_value, &rs->sr_text, op->o_tmpmemctx ); + if( rs->sr_err != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); goto cleanup; } - if( strcasecmp( ndn.bv_val, LDAP_ROOT_DSE ) == 0 ) { + if( strcasecmp( op->o_req_ndn.bv_val, LDAP_ROOT_DSE ) == 0 ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ARGS, "do_compare: dn (%s) attr(%s) value (%s)\n", - pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); + op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); #else Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n", - pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); + op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); #endif Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n", - op->o_connid, op->o_opid, pdn.bv_val, + op->o_connid, op->o_opid, op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, 0 ); - rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ; - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); + if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); goto cleanup; } - rc = root_dse_info( conn, &entry, &text ); - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); + rs->sr_err = root_dse_info( op->o_conn, &entry, &rs->sr_text ); + if( rs->sr_err != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); goto cleanup; } - fentry = entry; - - } else if ( bvmatch( &ndn, &global_schemandn ) ) { + } else if ( bvmatch( &op->o_req_ndn, &global_schemandn ) ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ARGS, "do_compare: dn (%s) attr(%s) value (%s)\n", - pdn.bv_val, ava.aa_desc->ad_cname.bv_val, + op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); #else Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n", - pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); + op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); #endif Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n", - op->o_connid, op->o_opid, pdn.bv_val, + op->o_connid, op->o_opid, op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, 0 ); - rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ; - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); - rc = 0; + if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + rs->sr_err = 0; goto cleanup; } - rc = schema_info( &entry, &text ); - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); - rc = 0; + rs->sr_err = schema_info( &entry, &rs->sr_text ); + if( rs->sr_err != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + rs->sr_err = 0; goto cleanup; } - fentry = entry; } if( entry ) { - rc = compare_entry( conn, op, entry, &ava ); - if( fentry) entry_free( fentry ); + rs->sr_err = compare_entry( op, entry, &ava ); + entry_free( entry ); - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); + send_ldap_result( op, rs ); - if( rc == LDAP_COMPARE_TRUE || rc == LDAP_COMPARE_FALSE ) { - rc = 0; + if( rs->sr_err == LDAP_COMPARE_TRUE || rs->sr_err == LDAP_COMPARE_FALSE ) { + rs->sr_err = 0; } goto cleanup; @@ -224,67 +216,100 @@ do_compare( * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) { - BerVarray ref = referral_rewrite( default_referral, - NULL, &pdn, LDAP_SCOPE_DEFAULT ); + if ( (op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 )) == NULL ) { + rs->sr_ref = referral_rewrite( default_referral, + NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); - send_ldap_result( conn, op, rc = LDAP_REFERRAL, - NULL, NULL, ref ? ref : default_referral, NULL ); + rs->sr_err = LDAP_REFERRAL; + if (!rs->sr_ref) rs->sr_ref = default_referral; + send_ldap_result( op, rs ); - ber_bvarray_free( ref ); - rc = 0; + if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref ); + rs->sr_err = 0; goto cleanup; } /* check restrictions */ - rc = backend_check_restrictions( be, conn, op, NULL, &text ) ; - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, - NULL, text, NULL, NULL ); + if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); goto cleanup; } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, &pdn, &ndn ); - if ( rc != LDAP_SUCCESS ) { + if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) { goto cleanup; } #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ARGS, "do_compare: dn (%s) attr(%s) value (%s)\n", - pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); + op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); #else Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n", - pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); + op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); #endif Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n", - op->o_connid, op->o_opid, pdn.bv_val, + op->o_connid, op->o_opid, op->o_req_dn.bv_val, ava.aa_desc->ad_cname.bv_val, 0 ); +#if defined( LDAP_SLAPI ) + slapi_x_pblock_set_operation( pb, op ); + slapi_pblock_set( pb, SLAPI_COMPARE_TARGET, (void *)dn.bv_val ); + slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit ); + slapi_pblock_set( pb, SLAPI_COMPARE_TYPE, (void *)desc.bv_val ); + slapi_pblock_set( pb, SLAPI_COMPARE_VALUE, (void *)&value ); + + rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_COMPARE_FN, pb ); + if ( rs->sr_err < 0 ) { + /* + * A preoperation plugin failure will abort the + * entire operation. + */ +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, "do_compare: compare preoperation plugin " + "failed\n", 0, 0, 0); +#else + Debug(LDAP_DEBUG_TRACE, "do_compare: compare preoperation plugin " + "failed.\n", 0, 0, 0); +#endif + if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0 ) || + rs->sr_err == LDAP_SUCCESS ) { + rs->sr_err = LDAP_OTHER; + } + goto cleanup; + } +#endif /* defined( LDAP_SLAPI ) */ - /* deref suffix alias if appropriate */ - suffix_alias( be, &ndn ); - - if ( be->be_compare ) { - (*be->be_compare)( be, conn, op, &pdn, &ndn, &ava ); + if ( op->o_bd->be_compare ) { + op->orc_ava = &ava; + op->o_bd->be_compare( op, rs ); } else { - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "operation not supported within namingContext", - NULL, NULL ); + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "operation not supported within namingContext" ); + } + +#if defined( LDAP_SLAPI ) + if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_COMPARE_FN, pb ) < 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, "do_compare: compare postoperation plugins " + "failed\n", 0, 0, 0 ); +#else + Debug(LDAP_DEBUG_TRACE, "do_compare: compare postoperation plugins " + "failed.\n", 0, 0, 0); +#endif } +#endif /* defined( LDAP_SLAPI ) */ cleanup: - free( pdn.bv_val ); - free( ndn.bv_val ); - if ( ava.aa_value.bv_val ) free( ava.aa_value.bv_val ); + op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx ); + op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx ); + if ( ava.aa_value.bv_val ) op->o_tmpfree( ava.aa_value.bv_val, op->o_tmpmemctx ); - return rc; + return rs->sr_err; } static int compare_entry( - Connection *conn, Operation *op, Entry *e, AttributeAssertion *ava ) @@ -292,7 +317,7 @@ static int compare_entry( int rc = LDAP_NO_SUCH_ATTRIBUTE; Attribute *a; - if ( ! access_allowed( NULL, conn, op, e, + if ( ! access_allowed( op, e, ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) ) { return LDAP_INSUFFICIENT_ACCESS; @@ -304,7 +329,12 @@ static int compare_entry( { rc = LDAP_COMPARE_FALSE; - if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 ) { + if ( value_find_ex( ava->aa_desc, + SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH | + SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH, + a->a_nvals, + &ava->aa_value, op->o_tmpmemctx ) == 0 ) + { rc = LDAP_COMPARE_TRUE; break; }