X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=ff9334639c6ace1a56ebe123cbe427e2a707ac9b;hb=4325d05ebc5ca096ee4a0d0177e7651c028c7449;hp=dc6359619dc0767101a376644d77adec97cd0843;hpb=55cefef7ee1558439ed171485f40fe888550b0a1;p=openldap diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index dc6359619d..ff9334639c 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -1,7 +1,7 @@ /* filter.c - routines for parsing and dealing with filters */ /* $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 */ @@ -20,16 +20,12 @@ static int get_filter_list( Filter **f, const char **text ); -static int get_substring_filter( +static int get_ssa( Connection *conn, BerElement *ber, - Filter *f, + SubstringsAssertion **s, const char **text ); -static int filter_escape_value( - struct berval *in, - struct berval *out ); - static void simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ); @@ -40,6 +36,9 @@ static int get_simple_vrFilter( ValuesReturnFilter **f, const char **text ); +#ifdef SLAP_NVALUES +#define XXX 1 +#endif int get_filter( @@ -51,11 +50,10 @@ get_filter( ber_tag_t tag; ber_len_t len; int err; - Filter *f; + Filter f; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_filter: conn %d\n", - conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 ); #endif @@ -71,7 +69,7 @@ get_filter( * lessOrEqual [6] AttributeValueAssertion, * present [7] AttributeType,, * approxMatch [8] AttributeValueAssertion - * extensibleMatch [9] MatchingRuleAssertion + * extensibleMatch [9] MatchingRuleAssertion * } * * SubstringFilter ::= SEQUENCE { @@ -99,70 +97,75 @@ get_filter( return SLAPD_DISCONNECT; } - f = (Filter *) ch_malloc( sizeof(Filter) ); - f->f_next = NULL; - err = LDAP_SUCCESS; - f->f_choice = tag; - switch ( f->f_choice ) { + f.f_next = NULL; + f.f_choice = tag; + + switch ( f.f_choice ) { case LDAP_FILTER_EQUALITY: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, - "get_filter: conn %d EQUALITY\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL2, + "get_filter: conn %d EQUALITY\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_ava != NULL ); + assert( f.f_ava != NULL ); break; case LDAP_FILTER_SUBSTRINGS: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d SUBSTRINGS\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d SUBSTRINGS\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 ); #endif - err = get_substring_filter( conn, ber, f, text ); + err = get_ssa( conn, ber, &f.f_sub, text ); + if( err != LDAP_SUCCESS ) { + break; + } + assert( f.f_sub != NULL ); break; case LDAP_FILTER_GE: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d GE\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d GE\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } + assert( f.f_ava != NULL ); break; case LDAP_FILTER_LE: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d LE\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d LE\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } + assert( f.f_ava != NULL ); break; case LDAP_FILTER_PRESENT: { struct berval type; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d PRESENT\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d PRESENT\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 ); #endif @@ -172,124 +175,132 @@ get_filter( break; } - f->f_desc = NULL; - err = slap_bv2ad( &type, &f->f_desc, text ); + f.f_desc = NULL; + err = slap_bv2ad( &type, &f.f_desc, text ); if( err != LDAP_SUCCESS ) { /* unrecognized attribute description or other error */ - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = LDAP_COMPARE_FALSE; + f.f_choice = SLAPD_FILTER_COMPUTED; + f.f_result = LDAP_COMPARE_FALSE; err = LDAP_SUCCESS; break; } + + assert( f.f_desc != NULL ); } break; case LDAP_FILTER_APPROX: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d APPROX\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d APPROX\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text ); + err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text ); if ( err != LDAP_SUCCESS ) { break; } + assert( f.f_ava != NULL ); break; case LDAP_FILTER_AND: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d AND\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d AND\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 ); #endif - err = get_filter_list( conn, ber, &f->f_and, text ); + err = get_filter_list( conn, ber, &f.f_and, text ); if ( err != LDAP_SUCCESS ) { break; } + /* no assert - list could be empty */ break; case LDAP_FILTER_OR: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d OR\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d OR\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 ); #endif - err = get_filter_list( conn, ber, &f->f_or, text ); + err = get_filter_list( conn, ber, &f.f_or, text ); if ( err != LDAP_SUCCESS ) { break; } + /* no assert - list could be empty */ break; case LDAP_FILTER_NOT: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d NOT\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d NOT\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 ); #endif (void) ber_skip_tag( ber, &len ); - err = get_filter( conn, ber, &f->f_not, text ); + err = get_filter( conn, ber, &f.f_not, text ); if ( err != LDAP_SUCCESS ) { break; } + +#ifdef XXX + assert( f.f_not != NULL ); +#endif break; case LDAP_FILTER_EXT: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_filter: conn %d EXTENSIBLE\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_filter: conn %d EXTENSIBLE\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 ); #endif - err = get_mra( ber, &f->f_mra, text ); + err = get_mra( ber, &f.f_mra, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_mra != NULL ); +#ifdef XXX + assert( f.f_mra != NULL ); +#endif break; default: (void) ber_scanf( ber, "x" ); /* skip the element */ #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ERR, + LDAP_LOG( FILTER, ERR, "get_filter: conn %d unknown filter type=%lu\n", - conn->c_connid, f->f_choice )); + conn->c_connid, f.f_choice, 0 ); #else Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n", - f->f_choice, 0, 0 ); + f.f_choice, 0, 0 ); #endif - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; + f.f_choice = SLAPD_FILTER_COMPUTED; + f.f_result = SLAPD_COMPARE_UNDEFINED; break; } - if ( err != LDAP_SUCCESS ) { - if( err != SLAPD_DISCONNECT ) { - /* ignore error */ - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; - err = LDAP_SUCCESS; - *filt = f; - - } else { - free(f); - } + if( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) { + /* ignore error */ + f.f_choice = SLAPD_FILTER_COMPUTED; + f.f_result = SLAPD_COMPARE_UNDEFINED; + err = LDAP_SUCCESS; + } - } else { - *filt = f; + if ( err == LDAP_SUCCESS ) { + *filt = ch_malloc( sizeof(f) ); + **filt = f; } #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, - "get_filter: conn %d exit\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL2, + "get_filter: conn %d exit\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 ); #endif + return( err ); } @@ -305,13 +316,14 @@ get_filter_list( Connection *conn, BerElement *ber, char *last; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_filter_list: conn %d start\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_filter_list: conn %d start\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 ); #endif new = f; - for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; + for ( tag = ber_first_element( ber, &len, &last ); + tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) { err = get_filter( conn, ber, new, text ); @@ -322,8 +334,8 @@ get_filter_list( Connection *conn, BerElement *ber, *new = NULL; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_filter_list: conn %d exit\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_filter_list: conn %d exit\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 ); #endif @@ -331,47 +343,48 @@ get_filter_list( Connection *conn, BerElement *ber, } static int -get_substring_filter( +get_ssa( Connection *conn, BerElement *ber, - Filter *f, + SubstringsAssertion **out, const char **text ) { ber_tag_t tag; ber_len_t len; ber_tag_t rc; - struct berval value; + struct berval desc, value, nvalue; char *last; - struct berval bv; + SubstringsAssertion ssa; + *text = "error decoding filter"; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_substring_filter: conn %d begin\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_ssa: conn %d begin\n", conn->c_connid, 0, 0 ); #else - Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_FILTER, "begin get_ssa\n", 0, 0, 0 ); #endif - if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) { + if ( ber_scanf( ber, "{m" /*}*/, &desc ) == LBER_ERROR ) { return SLAPD_DISCONNECT; } - f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) ); - f->f_sub_desc = NULL; - rc = slap_bv2ad( &bv, &f->f_sub_desc, text ); + *text = NULL; + + ssa.sa_desc = NULL; + ssa.sa_initial.bv_val = NULL; + ssa.sa_any = NULL; + ssa.sa_final.bv_val = NULL; + + rc = slap_bv2ad( &desc, &ssa.sa_desc, text ); if( rc != LDAP_SUCCESS ) { - text = NULL; - ch_free( f->f_sub ); - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; return LDAP_SUCCESS; } - f->f_sub_initial.bv_val = NULL; - f->f_sub_any = NULL; - f->f_sub_final.bv_val = NULL; + rc = LDAP_PROTOCOL_ERROR; - for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; + for ( tag = ber_first_element( ber, &len, &last ); + tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) { unsigned usage; @@ -404,126 +417,145 @@ get_substring_filter( rc = LDAP_PROTOCOL_ERROR; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ERR, + LDAP_LOG( FILTER, ERR, "get_filter_substring: conn %d unknown substring choice=%ld\n", - conn->c_connid, (long)tag )); + conn->c_connid, (long)tag, 0 ); #else Debug( LDAP_DEBUG_FILTER, " unknown substring choice=%ld\n", (long) tag, 0, 0 ); #endif + goto return_error; } - /* valiate using equality matching rule validator! */ - rc = value_validate( f->f_sub_desc->ad_type->sat_equality, +#ifdef SLAP_NVALUES + /* validate/normalize using equality matching rule validator! */ + rc = asserted_value_validate_normalize( + ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality, + usage, &value, &nvalue, text ); + + if( rc != LDAP_SUCCESS ) { + goto return_error; + } +#else + /* validate using equality matching rule validator! */ + rc = value_validate( ssa.sa_desc->ad_type->sat_equality, &value, text ); if( rc != LDAP_SUCCESS ) { goto return_error; } - rc = value_normalize( f->f_sub_desc, usage, - &value, &bv, text ); + rc = value_normalize( ssa.sa_desc, usage, + &value, &nvalue, text ); + if( rc != LDAP_SUCCESS ) { goto return_error; } - - value = bv; +#endif rc = LDAP_PROTOCOL_ERROR; switch ( tag ) { case LDAP_SUBSTRING_INITIAL: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_substring_filter: conn %d INITIAL\n", - conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_ssa: conn %d INITIAL\n", + conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); #endif - if ( f->f_sub_initial.bv_val != NULL - || f->f_sub_any != NULL - || f->f_sub_final.bv_val != NULL ) + if ( ssa.sa_initial.bv_val != NULL + || ssa.sa_any != NULL + || ssa.sa_final.bv_val != NULL ) { - free( value.bv_val ); + free( nvalue.bv_val ); goto return_error; } - f->f_sub_initial = value; + ssa.sa_initial = nvalue; break; case LDAP_SUBSTRING_ANY: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_substring_filter: conn %d ANY\n", - conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_ssa: conn %d ANY\n", + conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); #endif - if ( f->f_sub_final.bv_val != NULL ) { - free( value.bv_val ); + if ( ssa.sa_final.bv_val != NULL ) { + free( nvalue.bv_val ); goto return_error; } - ber_bvarray_add( &f->f_sub_any, &value ); + ber_bvarray_add( &ssa.sa_any, &nvalue ); break; case LDAP_SUBSTRING_FINAL: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_substring_filter: conn %d FINAL\n", - conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_ssa: conn %d FINAL\n", + conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); #endif - if ( f->f_sub_final.bv_val != NULL ) { - free( value.bv_val ); + if ( ssa.sa_final.bv_val != NULL ) { + free( nvalue.bv_val ); goto return_error; } - f->f_sub_final = value; + ssa.sa_final = nvalue; break; default: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_INFO, - "get_substring_filter: conn %d unknown substring type %ld\n", - conn->c_connid, (long)tag )); + LDAP_LOG( FILTER, INFO, + "get_ssa: conn %d unknown substring type %ld\n", + conn->c_connid, (long)tag, 0 ); #else Debug( LDAP_DEBUG_FILTER, " unknown substring type=%ld\n", (long) tag, 0, 0 ); #endif - free( value.bv_val ); + assert( 0 ); + free( nvalue.bv_val ); return_error: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_INFO, - "get_substring_filter: conn %d error %ld\n", - conn->c_connid, (long)rc )); + LDAP_LOG( FILTER, INFO, + "get_ssa: conn %d error %ld\n", + conn->c_connid, (long)rc, 0 ); #else Debug( LDAP_DEBUG_FILTER, " error=%ld\n", (long) rc, 0, 0 ); #endif - free( f->f_sub_initial.bv_val ); - ber_bvarray_free( f->f_sub_any ); - free( f->f_sub_final.bv_val ); - ch_free( f->f_sub ); + free( ssa.sa_initial.bv_val ); + ber_bvarray_free( ssa.sa_any ); + free( ssa.sa_final.bv_val ); return rc; } + + rc = LDAP_SUCCESS; + } + + if( rc == LDAP_SUCCESS ) { + *out = ch_malloc( sizeof( ssa ) ); + **out = ssa; } #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_substring_filter: conn %d exit\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_ssa: conn %d exit\n", conn->c_connid, 0, 0 ); #else - Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 ); #endif - return( LDAP_SUCCESS ); + + return LDAP_SUCCESS; } void @@ -575,8 +607,8 @@ filter_free( Filter *f ) default: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ERR, - "filter_free: unknown filter type %lu\n", f->f_choice )); + LDAP_LOG( FILTER, ERR, + "filter_free: unknown filter type %lu\n", f->f_choice, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n", f->f_choice, 0, 0 ); @@ -606,7 +638,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)", f->f_av_desc->ad_cname.bv_val, @@ -620,7 +652,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(>=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)", f->f_av_desc->ad_cname.bv_val, @@ -634,7 +666,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(<=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)", f->f_av_desc->ad_cname.bv_val, @@ -648,7 +680,7 @@ filter2bv( Filter *f, struct berval *fstr ) fstr->bv_len = f->f_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(~=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)", f->f_av_desc->ad_cname.bv_val, @@ -659,7 +691,7 @@ filter2bv( Filter *f, struct berval *fstr ) case LDAP_FILTER_SUBSTRINGS: fstr->bv_len = f->f_sub_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", f->f_sub_desc->ad_cname.bv_val ); @@ -714,7 +746,7 @@ filter2bv( Filter *f, struct berval *fstr ) case LDAP_FILTER_PRESENT: fstr->bv_len = f->f_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", f->f_desc->ad_cname.bv_val ); @@ -724,7 +756,7 @@ filter2bv( Filter *f, struct berval *fstr ) case LDAP_FILTER_OR: case LDAP_FILTER_NOT: fstr->bv_len = sizeof("(%)") - 1; - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)", f->f_choice == LDAP_FILTER_AND ? '&' : @@ -746,23 +778,31 @@ filter2bv( Filter *f, struct berval *fstr ) break; - case LDAP_FILTER_EXT: + case LDAP_FILTER_EXT: { + struct berval ad; filter_escape_value( &f->f_mr_value, &tmp ); - fstr->bv_len = f->f_mr_desc->ad_cname.bv_len + + if ( f->f_mr_desc ) { + ad = f->f_mr_desc->ad_cname; + } else { + ad.bv_len = 0; + ad.bv_val = ""; + } + + fstr->bv_len = ad.bv_len + ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) + ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) + tmp.bv_len + ( sizeof("(:=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)", - f->f_mr_desc->ad_cname.bv_val, + ad.bv_val, f->f_mr_dnattrs ? ":dn" : "", f->f_mr_rule_text.bv_len ? ":" : "", f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "", tmp.bv_val ); ber_memfree( tmp.bv_val ); - break; + } break; case SLAPD_FILTER_COMPUTED: ber_str2bv( @@ -783,7 +823,8 @@ filter2bv( Filter *f, struct berval *fstr ) } } -static int filter_escape_value( +int +filter_escape_value( struct berval *in, struct berval *out ) { @@ -818,11 +859,11 @@ get_simple_vrFilter( ber_tag_t tag; ber_len_t len; int err; - ValuesReturnFilter *f; + ValuesReturnFilter vrf; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_simple_vrFilter: conn %d\n", - conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_simple_vrFilter: conn %d\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "begin get_simple_vrFilter\n", 0, 0, 0 ); #endif @@ -834,46 +875,45 @@ get_simple_vrFilter( return SLAPD_DISCONNECT; } - f = (ValuesReturnFilter *) ch_malloc( sizeof(ValuesReturnFilter) ); - f->f_next = NULL; + vrf.vrf_next = NULL; err = LDAP_SUCCESS; - f->f_choice = tag; + vrf.vrf_choice = tag; - switch ( f->f_choice ) { + switch ( vrf.vrf_choice ) { case LDAP_FILTER_EQUALITY: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, - "get_simple_vrFilter: conn %d EQUALITY\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL2, + "get_simple_vrFilter: conn %d EQUALITY\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_EQUALITY, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_ava != NULL ); + assert( vrf.vrf_ava != NULL ); break; case LDAP_FILTER_SUBSTRINGS: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_simple_vrFilter: conn %d SUBSTRINGS\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_simple_vrFilter: conn %d SUBSTRINGS\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 ); #endif - err = get_substring_filter( conn, ber, (Filter *)f, text ); + err = get_ssa( conn, ber, &vrf.vrf_sub, text ); break; case LDAP_FILTER_GE: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_simple_vrFilter: conn %d GE\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_simple_vrFilter: conn %d GE\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -881,12 +921,12 @@ get_simple_vrFilter( case LDAP_FILTER_LE: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_simple_vrFilter: conn %d LE\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_simple_vrFilter: conn %d LE\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -896,8 +936,8 @@ get_simple_vrFilter( struct berval type; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_simple_vrFilter: conn %d PRESENT\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_simple_vrFilter: conn %d PRESENT\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 ); #endif @@ -907,13 +947,13 @@ get_simple_vrFilter( break; } - f->f_desc = NULL; - err = slap_bv2ad( &type, &f->f_desc, text ); + vrf.vrf_desc = NULL; + err = slap_bv2ad( &type, &vrf.vrf_desc, text ); if( err != LDAP_SUCCESS ) { /* unrecognized attribute description or other error */ - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = LDAP_COMPARE_FALSE; + vrf.vrf_choice = SLAPD_FILTER_COMPUTED; + vrf.vrf_result = LDAP_COMPARE_FALSE; err = LDAP_SUCCESS; break; } @@ -921,12 +961,12 @@ get_simple_vrFilter( case LDAP_FILTER_APPROX: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_simple_vrFilter: conn %d APPROX\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_simple_vrFilter: conn %d APPROX\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 ); #endif - err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_EQUALITY_APPROX, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -934,63 +974,60 @@ get_simple_vrFilter( case LDAP_FILTER_EXT: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_simple_vrFilter: conn %d EXTENSIBLE\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_simple_vrFilter: conn %d EXTENSIBLE\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 ); #endif - err = get_mra( ber, &f->f_mra, text ); + err = get_mra( ber, &vrf.vrf_mra, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( f->f_mra != NULL ); + assert( vrf.vrf_mra != NULL ); break; default: (void) ber_scanf( ber, "x" ); /* skip the element */ #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ERR, + LDAP_LOG( FILTER, ERR, "get_simple_vrFilter: conn %d unknown filter type=%lu\n", - conn->c_connid, f->f_choice )); + conn->c_connid, vrf.vrf_choice, 0 ); #else Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n", - f->f_choice, 0, 0 ); + vrf.vrf_choice, 0, 0 ); #endif - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; + vrf.vrf_choice = SLAPD_FILTER_COMPUTED; + vrf.vrf_result = SLAPD_COMPARE_UNDEFINED; break; } - if ( err != LDAP_SUCCESS ) { - if( err != SLAPD_DISCONNECT ) { - /* ignore error */ - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; - err = LDAP_SUCCESS; - *filt = f; - - } else { - free(f); - } + if ( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) { + /* ignore error */ + vrf.vrf_choice = SLAPD_FILTER_COMPUTED; + vrf.vrf_result = SLAPD_COMPARE_UNDEFINED; + err = LDAP_SUCCESS; + } - } else { - *filt = f; + if ( err == LDAP_SUCCESS ) { + *filt = ch_malloc( sizeof vrf ); + **filt = vrf; } #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, - "get_simple_vrFilter: conn %d exit\n", conn->c_connid )); + LDAP_LOG( FILTER, DETAIL2, + "get_simple_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 ); #endif - return( err ); + + return err; } int get_vrFilter( Connection *conn, BerElement *ber, - ValuesReturnFilter **f, + ValuesReturnFilter **vrf, const char **text ) { /* @@ -1022,14 +1059,14 @@ get_vrFilter( Connection *conn, BerElement *ber, * matchValue [3] AssertionValue } */ - ValuesReturnFilter **new; + ValuesReturnFilter **n; ber_tag_t tag; ber_len_t len; char *last; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_vrFilter: conn %d start\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_vrFilter: conn %d start\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "begin get_vrFilter\n", 0, 0, 0 ); #endif @@ -1046,20 +1083,22 @@ get_vrFilter( Connection *conn, BerElement *ber, return SLAPD_DISCONNECT; } - new = f; - for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; + n = vrf; + for ( tag = ber_first_element( ber, &len, &last ); + tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) { - int err = get_simple_vrFilter( conn, ber, new, text ); - if ( err != LDAP_SUCCESS ) - return( err ); - new = &(*new)->f_next; + int err = get_simple_vrFilter( conn, ber, n, text ); + + if ( err != LDAP_SUCCESS ) return( err ); + + n = &(*n)->vrf_next; } - *new = NULL; + *n = NULL; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_vrFilter: conn %d exit\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "end get_vrFilter\n", 0, 0, 0 ); #endif @@ -1067,18 +1106,18 @@ get_vrFilter( Connection *conn, BerElement *ber, } void -vrFilter_free( ValuesReturnFilter *f ) +vrFilter_free( ValuesReturnFilter *vrf ) { ValuesReturnFilter *p, *next; - if ( f == NULL ) { + if ( vrf == NULL ) { return; } - for ( p = f; p != NULL; p = next ) { - next = p->f_next; + for ( p = vrf; p != NULL; p = next ) { + next = p->vrf_next; - switch ( f->f_choice ) { + switch ( vrf->vrf_choice ) { case LDAP_FILTER_PRESENT: break; @@ -1086,22 +1125,22 @@ vrFilter_free( ValuesReturnFilter *f ) case LDAP_FILTER_GE: case LDAP_FILTER_LE: case LDAP_FILTER_APPROX: - ava_free( f->f_ava, 1 ); + ava_free( vrf->vrf_ava, 1 ); break; case LDAP_FILTER_SUBSTRINGS: - if ( f->f_sub_initial.bv_val != NULL ) { - free( f->f_sub_initial.bv_val ); + if ( vrf->vrf_sub_initial.bv_val != NULL ) { + free( vrf->vrf_sub_initial.bv_val ); } - ber_bvarray_free( f->f_sub_any ); - if ( f->f_sub_final.bv_val != NULL ) { - free( f->f_sub_final.bv_val ); + ber_bvarray_free( vrf->vrf_sub_any ); + if ( vrf->vrf_sub_final.bv_val != NULL ) { + free( vrf->vrf_sub_final.bv_val ); } - ch_free( f->f_sub ); + ch_free( vrf->vrf_sub ); break; case LDAP_FILTER_EXT: - mra_free( f->f_mra, 1 ); + mra_free( vrf->vrf_mra, 1 ); break; case SLAPD_FILTER_COMPUTED: @@ -1109,39 +1148,38 @@ vrFilter_free( ValuesReturnFilter *f ) default: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ERR, - "filter_free: unknown filter type %lu\n", f->f_choice )); + LDAP_LOG( FILTER, ERR, + "filter_free: unknown filter type %lu\n", vrf->vrf_choice, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n", - f->f_choice, 0, 0 ); + vrf->vrf_choice, 0, 0 ); #endif break; } - free( f ); + free( vrf ); } } void -vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ) +vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) { - int i; ValuesReturnFilter *p; struct berval tmp; ber_len_t len; - if ( f == NULL ) { + if ( vrf == NULL ) { ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr ); return; } fstr->bv_len = sizeof("()") - 1; - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "()"); - for ( p = f; p != NULL; p = p->f_next ) { + for ( p = vrf; p != NULL; p = p->vrf_next ) { len = fstr->bv_len; simple_vrFilter2bv( p, &tmp ); @@ -1157,86 +1195,84 @@ vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ) } static void -simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ) +simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) { - int i; - ValuesReturnFilter *p; struct berval tmp; ber_len_t len; - if ( f == NULL ) { + if ( vrf == NULL ) { ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr ); return; } - switch ( f->f_choice ) { + switch ( vrf->vrf_choice ) { case LDAP_FILTER_EQUALITY: - filter_escape_value( &f->f_av_value, &tmp ); + filter_escape_value( &vrf->vrf_av_value, &tmp ); - fstr->bv_len = f->f_av_desc->ad_cname.bv_len + + fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)", - f->f_av_desc->ad_cname.bv_val, + vrf->vrf_av_desc->ad_cname.bv_val, tmp.bv_val ); ber_memfree( tmp.bv_val ); break; case LDAP_FILTER_GE: - filter_escape_value( &f->f_av_value, &tmp ); + filter_escape_value( &vrf->vrf_av_value, &tmp ); - fstr->bv_len = f->f_av_desc->ad_cname.bv_len + + fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(>=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)", - f->f_av_desc->ad_cname.bv_val, + vrf->vrf_av_desc->ad_cname.bv_val, tmp.bv_val ); ber_memfree( tmp.bv_val ); break; case LDAP_FILTER_LE: - filter_escape_value( &f->f_av_value, &tmp ); + filter_escape_value( &vrf->vrf_av_value, &tmp ); - fstr->bv_len = f->f_av_desc->ad_cname.bv_len + + fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(<=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)", - f->f_av_desc->ad_cname.bv_val, + vrf->vrf_av_desc->ad_cname.bv_val, tmp.bv_val ); ber_memfree( tmp.bv_val ); break; case LDAP_FILTER_APPROX: - filter_escape_value( &f->f_av_value, &tmp ); + filter_escape_value( &vrf->vrf_av_value, &tmp ); - fstr->bv_len = f->f_av_desc->ad_cname.bv_len + + fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len + tmp.bv_len + ( sizeof("(~=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)", - f->f_av_desc->ad_cname.bv_val, + vrf->vrf_av_desc->ad_cname.bv_val, tmp.bv_val ); ber_memfree( tmp.bv_val ); break; case LDAP_FILTER_SUBSTRINGS: - fstr->bv_len = f->f_sub_desc->ad_cname.bv_len + + fstr->bv_len = vrf->vrf_sub_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 128 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 128 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", - f->f_sub_desc->ad_cname.bv_val ); + vrf->vrf_sub_desc->ad_cname.bv_val ); - if ( f->f_sub_initial.bv_val != NULL ) { + if ( vrf->vrf_sub_initial.bv_val != NULL ) { len = fstr->bv_len; - filter_escape_value( &f->f_sub_initial, &tmp ); + filter_escape_value( &vrf->vrf_sub_initial, &tmp ); fstr->bv_len += tmp.bv_len; fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 ); @@ -1248,10 +1284,11 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ) ber_memfree( tmp.bv_val ); } - if ( f->f_sub_any != NULL ) { - for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) { + if ( vrf->vrf_sub_any != NULL ) { + int i; + for ( i = 0; vrf->vrf_sub_any[i].bv_val != NULL; i++ ) { len = fstr->bv_len; - filter_escape_value( &f->f_sub_any[i], &tmp ); + filter_escape_value( &vrf->vrf_sub_any[i], &tmp ); fstr->bv_len += tmp.bv_len + 1; fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 ); @@ -1263,10 +1300,10 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ) } } - if ( f->f_sub_final.bv_val != NULL ) { + if ( vrf->vrf_sub_final.bv_val != NULL ) { len = fstr->bv_len; - filter_escape_value( &f->f_sub_final, &tmp ); + filter_escape_value( &vrf->vrf_sub_final, &tmp ); fstr->bv_len += tmp.bv_len; fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 ); @@ -1281,41 +1318,50 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ) break; case LDAP_FILTER_PRESENT: - fstr->bv_len = f->f_desc->ad_cname.bv_len + + fstr->bv_len = vrf->vrf_desc->ad_cname.bv_len + ( sizeof("(=*)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)", - f->f_desc->ad_cname.bv_val ); + vrf->vrf_desc->ad_cname.bv_val ); break; - case LDAP_FILTER_EXT: - filter_escape_value( &f->f_mr_value, &tmp ); + case LDAP_FILTER_EXT: { + struct berval ad; + filter_escape_value( &vrf->vrf_mr_value, &tmp ); - fstr->bv_len = f->f_mr_desc->ad_cname.bv_len + - ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) + - ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) + + if ( vrf->vrf_mr_desc ) { + ad = vrf->vrf_mr_desc->ad_cname; + } else { + ad.bv_len = 0; + ad.bv_val = ""; + } + + fstr->bv_len = ad.bv_len + + ( vrf->vrf_mr_dnattrs ? sizeof(":dn")-1 : 0 ) + + ( vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) + tmp.bv_len + ( sizeof("(:=)") - 1 ); - fstr->bv_val = malloc( fstr->bv_len + 1 ); + fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)", - f->f_mr_desc->ad_cname.bv_val, - f->f_mr_dnattrs ? ":dn" : "", - f->f_mr_rule_text.bv_len ? ":" : "", - f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "", + ad.bv_val, + vrf->vrf_mr_dnattrs ? ":dn" : "", + vrf->vrf_mr_rule_text.bv_len ? ":" : "", + vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_val : "", tmp.bv_val ); + ber_memfree( tmp.bv_val ); - break; + } break; case SLAPD_FILTER_COMPUTED: ber_str2bv( - f->f_result == LDAP_COMPARE_FALSE ? "(?=false)" : - f->f_result == LDAP_COMPARE_TRUE ? "(?=true)" : - f->f_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" : + vrf->vrf_result == LDAP_COMPARE_FALSE ? "(?=false)" : + vrf->vrf_result == LDAP_COMPARE_TRUE ? "(?=true)" : + vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" : "(?=error)", - f->f_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 : - f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 : - f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 : + vrf->vrf_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 : + vrf->vrf_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 : + vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 : sizeof("(?=error)")-1, 1, fstr ); break; @@ -1326,11 +1372,12 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr ) } } +#if 0 /* unused */ static int get_substring_vrFilter( Connection *conn, BerElement *ber, - ValuesReturnFilter *f, + ValuesReturnFilter *vrf, const char **text ) { ber_tag_t tag; @@ -1342,8 +1389,8 @@ get_substring_vrFilter( *text = "error decoding filter"; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_substring_filter: conn %d begin\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_substring_filter: conn %d begin\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 ); #endif @@ -1351,21 +1398,21 @@ get_substring_vrFilter( return SLAPD_DISCONNECT; } - f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) ); - f->f_sub_desc = NULL; - rc = slap_bv2ad( &bv, &f->f_sub_desc, text ); + vrf->vrf_sub = ch_calloc( 1, sizeof(SubstringsAssertion) ); + vrf->vrf_sub_desc = NULL; + rc = slap_bv2ad( &bv, &vrf->vrf_sub_desc, text ); if( rc != LDAP_SUCCESS ) { text = NULL; - ch_free( f->f_sub ); - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; + ch_free( vrf->vrf_sub ); + vrf->vrf_choice = SLAPD_FILTER_COMPUTED; + vrf->vrf_result = SLAPD_COMPARE_UNDEFINED; return LDAP_SUCCESS; } - f->f_sub_initial.bv_val = NULL; - f->f_sub_any = NULL; - f->f_sub_final.bv_val = NULL; + vrf->vrf_sub_initial.bv_val = NULL; + vrf->vrf_sub_any = NULL; + vrf->vrf_sub_final.bv_val = NULL; for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) @@ -1400,9 +1447,9 @@ get_substring_vrFilter( rc = LDAP_PROTOCOL_ERROR; #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ERR, + LDAP_LOG( FILTER, ERR, "get_filter_substring: conn %d unknown substring choice=%ld\n", - conn->c_connid, (long)tag )); + conn->c_connid, (long)tag, 0 ); #else Debug( LDAP_DEBUG_FILTER, " unknown substring choice=%ld\n", @@ -1411,18 +1458,28 @@ get_substring_vrFilter( goto return_error; } +#ifdef SLAP_NVALUES + /* validate/normalize using equality matching rule validator! */ + rc = asserted_value_validate_normalize( + vrf->vrf_sub_desc, vrf->vrf_sub_desc->ad_type->sat_equality, + usage, &value, &bv, text ); + if( rc != LDAP_SUCCESS ) { + goto return_error; + } +#else /* valiate using equality matching rule validator! */ - rc = value_validate( f->f_sub_desc->ad_type->sat_equality, + rc = value_validate( vrf->vrf_sub_desc->ad_type->sat_equality, &value, text ); if( rc != LDAP_SUCCESS ) { goto return_error; } - rc = value_normalize( f->f_sub_desc, usage, + rc = value_normalize( vrf->vrf_sub_desc, usage, &value, &bv, text ); if( rc != LDAP_SUCCESS ) { goto return_error; } +#endif value = bv; @@ -1431,63 +1488,61 @@ get_substring_vrFilter( switch ( tag ) { case LDAP_SUBSTRING_INITIAL: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_substring_filter: conn %d INITIAL\n", - conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_substring_filter: conn %d INITIAL\n", + conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); #endif - if ( f->f_sub_initial.bv_val != NULL - || f->f_sub_any != NULL - || f->f_sub_final.bv_val != NULL ) + if ( vrf->vrf_sub_initial.bv_val != NULL + || vrf->vrf_sub_any != NULL + || vrf->vrf_sub_final.bv_val != NULL ) { free( value.bv_val ); goto return_error; } - f->f_sub_initial = value; + vrf->vrf_sub_initial = value; break; case LDAP_SUBSTRING_ANY: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_substring_filter: conn %d ANY\n", - conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_substring_filter: conn %d ANY\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); #endif - if ( f->f_sub_final.bv_val != NULL ) { + if ( vrf->vrf_sub_final.bv_val != NULL ) { free( value.bv_val ); goto return_error; } - ber_bvarray_add( &f->f_sub_any, &value ); + ber_bvarray_add( &vrf->vrf_sub_any, &value ); break; case LDAP_SUBSTRING_FINAL: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1, - "get_substring_filter: conn %d FINAL\n", - conn->c_connid )); + LDAP_LOG( FILTER, DETAIL1, + "get_substring_filter: conn %d FINAL\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); #endif - if ( f->f_sub_final.bv_val != NULL ) { + if ( vrf->vrf_sub_final.bv_val != NULL ) { free( value.bv_val ); goto return_error; } - f->f_sub_final = value; + vrf->vrf_sub_final = value; break; default: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_INFO, + LDAP_LOG( FILTER, INFO, "get_substring_filter: conn %d unknown substring type %ld\n", - conn->c_connid, (long)tag )); + conn->c_connid, (long)tag, 0 ); #else Debug( LDAP_DEBUG_FILTER, " unknown substring type=%ld\n", @@ -1498,27 +1553,27 @@ get_substring_vrFilter( return_error: #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_INFO, + LDAP_LOG( FILTER, INFO, "get_substring_filter: conn %d error %ld\n", - conn->c_connid, (long)rc )); + conn->c_connid, (long)rc, 0 ); #else Debug( LDAP_DEBUG_FILTER, " error=%ld\n", (long) rc, 0, 0 ); #endif - free( f->f_sub_initial.bv_val ); - ber_bvarray_free( f->f_sub_any ); - free( f->f_sub_final.bv_val ); - ch_free( f->f_sub ); + free( vrf->vrf_sub_initial.bv_val ); + ber_bvarray_free( vrf->vrf_sub_any ); + free( vrf->vrf_sub_final.bv_val ); + ch_free( vrf->vrf_sub ); return rc; } } #ifdef NEW_LOGGING - LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, - "get_substring_filter: conn %d exit\n", conn->c_connid )); + LDAP_LOG( FILTER, ENTRY, + "get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 ); #endif return( LDAP_SUCCESS ); } - +#endif /* unused */