X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=ff9334639c6ace1a56ebe123cbe427e2a707ac9b;hb=4325d05ebc5ca096ee4a0d0177e7651c028c7449;hp=eadf4f377c3b5072fcc092d1b5a3c4c96386b2d9;hpb=e3b1020e7558dff26d8c87ebb2746f197775c24f;p=openldap diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index eadf4f377c..ff9334639c 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -20,10 +20,10 @@ 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 void simple_vrFilter2bv( @@ -125,7 +125,7 @@ get_filter( #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; } @@ -343,10 +343,10 @@ 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; @@ -360,17 +360,15 @@ get_substring_filter( #ifdef NEW_LOGGING LDAP_LOG( FILTER, ENTRY, - "get_substring_filter: conn %d begin\n", conn->c_connid, 0, 0 ); + "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" /*}*/, &desc ) == LBER_ERROR ) { return SLAPD_DISCONNECT; } *text = NULL; - f->f_choice = SLAPD_FILTER_COMPUTED; - f->f_result = SLAPD_COMPARE_UNDEFINED; ssa.sa_desc = NULL; ssa.sa_initial.bv_val = NULL; @@ -398,7 +396,6 @@ get_substring_filter( } if ( value.bv_val == NULL || value.bv_len == 0 ) { - free( value.bv_val ); rc = LDAP_INVALID_SYNTAX; goto return_error; } @@ -428,7 +425,7 @@ get_substring_filter( " unknown substring choice=%ld\n", (long) tag, 0, 0 ); #endif - free( value.bv_val ); + goto return_error; } @@ -439,7 +436,6 @@ get_substring_filter( usage, &value, &nvalue, text ); if( rc != LDAP_SUCCESS ) { - free( value.bv_val ); goto return_error; } #else @@ -447,15 +443,12 @@ get_substring_filter( rc = value_validate( ssa.sa_desc->ad_type->sat_equality, &value, text ); if( rc != LDAP_SUCCESS ) { - free( value.bv_val ); goto return_error; } rc = value_normalize( ssa.sa_desc, usage, &value, &nvalue, text ); - free( value.bv_val ); - if( rc != LDAP_SUCCESS ) { goto return_error; } @@ -467,7 +460,7 @@ get_substring_filter( case LDAP_SUBSTRING_INITIAL: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL1, - "get_substring_filter: conn %d INITIAL\n", + "get_ssa: conn %d INITIAL\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); @@ -487,7 +480,7 @@ get_substring_filter( case LDAP_SUBSTRING_ANY: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL1, - "get_substring_filter: conn %d ANY\n", + "get_ssa: conn %d ANY\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); @@ -504,7 +497,7 @@ get_substring_filter( case LDAP_SUBSTRING_FINAL: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL1, - "get_substring_filter: conn %d FINAL\n", + "get_ssa: conn %d FINAL\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); @@ -521,7 +514,7 @@ get_substring_filter( default: #ifdef NEW_LOGGING LDAP_LOG( FILTER, INFO, - "get_substring_filter: conn %d unknown substring type %ld\n", + "get_ssa: conn %d unknown substring type %ld\n", conn->c_connid, (long)tag, 0 ); #else Debug( LDAP_DEBUG_FILTER, @@ -529,12 +522,13 @@ get_substring_filter( (long) tag, 0, 0 ); #endif + assert( 0 ); free( nvalue.bv_val ); return_error: #ifdef NEW_LOGGING LDAP_LOG( FILTER, INFO, - "get_substring_filter: conn %d error %ld\n", + "get_ssa: conn %d error %ld\n", conn->c_connid, (long)rc, 0 ); #else Debug( LDAP_DEBUG_FILTER, " error=%ld\n", @@ -550,16 +544,15 @@ return_error: } if( rc == LDAP_SUCCESS ) { - f->f_choice = LDAP_FILTER_SUBSTRINGS; - f->f_sub = ch_malloc( sizeof( ssa ) ); - *f->f_sub = ssa; + *out = ch_malloc( sizeof( ssa ) ); + **out = ssa; } #ifdef NEW_LOGGING LDAP_LOG( FILTER, ENTRY, - "get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 ); + "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; @@ -866,7 +859,7 @@ get_simple_vrFilter( ber_tag_t tag; ber_len_t len; int err; - ValuesReturnFilter *vrf; + ValuesReturnFilter vrf; #ifdef NEW_LOGGING LDAP_LOG( FILTER, ENTRY, @@ -882,13 +875,12 @@ get_simple_vrFilter( return SLAPD_DISCONNECT; } - vrf = (ValuesReturnFilter *) ch_malloc( sizeof(ValuesReturnFilter) ); - vrf->vrf_next = NULL; + vrf.vrf_next = NULL; err = LDAP_SUCCESS; - vrf->vrf_choice = tag; + vrf.vrf_choice = tag; - switch ( vrf->vrf_choice ) { + switch ( vrf.vrf_choice ) { case LDAP_FILTER_EQUALITY: #ifdef NEW_LOGGING LDAP_LOG( FILTER, DETAIL2, @@ -896,12 +888,12 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_EQUALITY, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( vrf->vrf_ava != NULL ); + assert( vrf.vrf_ava != NULL ); break; case LDAP_FILTER_SUBSTRINGS: @@ -911,7 +903,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 ); #endif - err = get_substring_filter( conn, ber, (Filter *)vrf, text ); + err = get_ssa( conn, ber, &vrf.vrf_sub, text ); break; case LDAP_FILTER_GE: @@ -921,7 +913,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -934,7 +926,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -955,13 +947,13 @@ get_simple_vrFilter( break; } - vrf->vrf_desc = NULL; - err = slap_bv2ad( &type, &vrf->vrf_desc, text ); + vrf.vrf_desc = NULL; + err = slap_bv2ad( &type, &vrf.vrf_desc, text ); if( err != LDAP_SUCCESS ) { /* unrecognized attribute description or other error */ - vrf->vrf_choice = SLAPD_FILTER_COMPUTED; - vrf->vrf_result = LDAP_COMPARE_FALSE; + vrf.vrf_choice = SLAPD_FILTER_COMPUTED; + vrf.vrf_result = LDAP_COMPARE_FALSE; err = LDAP_SUCCESS; break; } @@ -974,7 +966,7 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 ); #endif - err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY_APPROX, text ); + err = get_ava( ber, &vrf.vrf_ava, SLAP_MR_EQUALITY_APPROX, text ); if ( err != LDAP_SUCCESS ) { break; } @@ -988,12 +980,12 @@ get_simple_vrFilter( Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 ); #endif - err = get_mra( ber, &vrf->vrf_mra, text ); + err = get_mra( ber, &vrf.vrf_mra, text ); if ( err != LDAP_SUCCESS ) { break; } - assert( vrf->vrf_mra != NULL ); + assert( vrf.vrf_mra != NULL ); break; default: @@ -1001,30 +993,26 @@ get_simple_vrFilter( #ifdef NEW_LOGGING LDAP_LOG( FILTER, ERR, "get_simple_vrFilter: conn %d unknown filter type=%lu\n", - conn->c_connid, vrf->vrf_choice, 0 ); + conn->c_connid, vrf.vrf_choice, 0 ); #else Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n", - vrf->vrf_choice, 0, 0 ); + vrf.vrf_choice, 0, 0 ); #endif - vrf->vrf_choice = SLAPD_FILTER_COMPUTED; - vrf->vrf_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 */ - vrf->vrf_choice = SLAPD_FILTER_COMPUTED; - vrf->vrf_result = SLAPD_COMPARE_UNDEFINED; - err = LDAP_SUCCESS; - *filt = vrf; - - } else { - free(vrf); - } + 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 = vrf; + if ( err == LDAP_SUCCESS ) { + *filt = ch_malloc( sizeof vrf ); + **filt = vrf; } #ifdef NEW_LOGGING @@ -1033,7 +1021,8 @@ get_simple_vrFilter( #else Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 ); #endif - return( err ); + + return err; } int @@ -1100,8 +1089,9 @@ get_vrFilter( Connection *conn, BerElement *ber, tag = ber_next_element( ber, &len, last ) ) { int err = get_simple_vrFilter( conn, ber, n, text ); - if ( err != LDAP_SUCCESS ) - return( err ); + + if ( err != LDAP_SUCCESS ) return( err ); + n = &(*n)->vrf_next; } *n = NULL; @@ -1382,6 +1372,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr ) } } +#if 0 /* unused */ static int get_substring_vrFilter( Connection *conn, @@ -1585,4 +1576,4 @@ return_error: #endif return( LDAP_SUCCESS ); } - +#endif /* unused */