--- servers/slapd/filter.c 2000/05/16 14:22:52 1.32 +++ servers/slapd/filter.c 2000/05/21 21:15:55 1.41 @@ -1,5 +1,5 @@ /* filter.c - routines for parsing and dealing with filters */ -/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.31 2000/05/15 21:47:51 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.40 2000/05/18 15:21:42 kurt Exp $ */ /* * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file @@ -94,12 +94,18 @@ get_filter( case LDAP_FILTER_EQUALITY: Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 ); - if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) { - *text = "error decoding filter"; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text ); +#else + err = get_ava( ber, &f->f_ava, text ); +#endif + if ( err != LDAP_SUCCESS ) { break; } #ifdef SLAPD_SCHEMA_NOT_COMPAT + assert( f->f_ava != NULL ); + *fstr = ch_malloc( sizeof("(=)") + f->f_av_desc->ad_cname->bv_len + f->f_av_value->bv_len ); @@ -125,8 +131,12 @@ get_filter( case LDAP_FILTER_GE: Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 ); - if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) { - *text = "decoding filter error"; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); +#else + err = get_ava( ber, &f->f_ava, text ); +#endif + if ( err != LDAP_SUCCESS ) { break; } @@ -151,11 +161,16 @@ get_filter( case LDAP_FILTER_LE: Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 ); - if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) { - *text = "decoding filter error"; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text ); +#else + err = get_ava( ber, &f->f_ava, text ); +#endif + if ( err != LDAP_SUCCESS ) { break; } + #ifdef SLAPD_SCHEMA_NOT_COMPAT *fstr = ch_malloc( sizeof("(<=)") + f->f_av_desc->ad_cname->bv_len @@ -186,20 +201,16 @@ get_filter( } #ifdef SLAPD_SCHEMA_NOT_COMPAT - { - char *text; - int rc; - f->f_desc = NULL; - err = slap_bv2ad( &type, &f->f_desc, &text ); - - if( err != LDAP_SUCCESS ) { - ch_free( type.bv_val ); - break; - } + f->f_desc = NULL; + err = slap_bv2ad( &type, &f->f_desc, text ); + if( err != LDAP_SUCCESS ) { ch_free( type.bv_val ); + break; } + ch_free( type.bv_val ); + *fstr = ch_malloc( sizeof("(=*)") + f->f_desc->ad_cname->bv_len ); sprintf( *fstr, "(%s=*)", @@ -218,8 +229,12 @@ get_filter( case LDAP_FILTER_APPROX: Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 ); - if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) { - *text = "decoding filter error"; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text ); +#else + err = get_ava( ber, &f->f_ava, text ); +#endif + if ( err != LDAP_SUCCESS ) { break; } @@ -359,11 +374,12 @@ get_substring_filter( ber_tag_t tag; ber_len_t len; ber_tag_t rc; - struct berval *val; + struct berval *value; char *last; struct berval type; #ifndef SLAPD_SCHEMA_NOT_COMPAT int syntax; + struct berval *nvalue; #endif *text = "error decoding filter"; @@ -374,6 +390,7 @@ get_substring_filter( } #ifdef SLAPD_SCHEMA_NOT_COMPAT + f->f_sub_desc = NULL; rc = slap_bv2ad( &type, &f->f_sub_desc, text ); ch_free( type.bv_val ); @@ -413,71 +430,108 @@ get_substring_filter( for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) { - rc = ber_scanf( ber, "O", &val ); + unsigned usage; + + rc = ber_scanf( ber, "O", &value ); if ( rc == LBER_ERROR ) { rc = SLAPD_DISCONNECT; goto return_error; } - if ( val == NULL || val->bv_len == 0 ) { - ber_bvfree( val ); + if ( value == NULL || value->bv_len == 0 ) { + ber_bvfree( value ); rc = LDAP_INVALID_SYNTAX; goto return_error; } - rc = LDAP_PROTOCOL_ERROR; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + switch ( tag ) { + case LDAP_SUBSTRING_INITIAL: + usage = SLAP_MR_SUBSTR_INITIAL; + break; + + case LDAP_SUBSTRING_ANY: + usage = SLAP_MR_SUBSTR_ANY; + break; + + case LDAP_SUBSTRING_FINAL: + usage = SLAP_MR_SUBSTR_FINAL; + break; + + default: + rc = LDAP_PROTOCOL_ERROR; + + Debug( LDAP_DEBUG_FILTER, + " unknown substring choice=%ld\n", + (long) tag, 0, 0 ); + + ber_bvfree( value ); + goto return_error; + } + + rc = value_normalize( f->f_sub_desc, usage, value, &nvalue, text ); + ber_bvfree( value ); + + if( rc != LDAP_SUCCESS ) { + goto return_error; + } + + value = nvalue; +#else -#ifndef SLAPD_SCHEMA_NOT_COMPAT /* we should call a substring syntax normalization routine */ - value_normalize( val->bv_val, syntax ); + value_normalize( value->bv_val, syntax ); /* this is bogus, value_normalize should take a berval */ - val->bv_len = strlen( val->bv_val ); + value->bv_len = strlen( value->bv_val ); #endif + rc = LDAP_PROTOCOL_ERROR; + switch ( tag ) { case LDAP_SUBSTRING_INITIAL: Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); if ( f->f_sub_initial != NULL ) { - ber_bvfree( val ); + ber_bvfree( value ); goto return_error; } - f->f_sub_initial = val; + + f->f_sub_initial = value; if( fstr ) { *fstr = ch_realloc( *fstr, - strlen( *fstr ) + val->bv_len + 1 ); - strcat( *fstr, val->bv_val ); + strlen( *fstr ) + value->bv_len + 1 ); + strcat( *fstr, value->bv_val ); } break; case LDAP_SUBSTRING_ANY: Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); - if( ber_bvecadd( &f->f_sub_any, val ) < 0 ) { - ber_bvfree( val ); + if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) { + ber_bvfree( value ); goto return_error; } if( fstr ) { *fstr = ch_realloc( *fstr, - strlen( *fstr ) + val->bv_len + 2 ); + strlen( *fstr ) + value->bv_len + 2 ); strcat( *fstr, "*" ); - strcat( *fstr, val->bv_val ); + strcat( *fstr, value->bv_val ); } break; case LDAP_SUBSTRING_FINAL: Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); if ( f->f_sub_final != NULL ) { - ber_bvfree( val ); + ber_bvfree( value ); goto return_error; } - f->f_sub_final = val; + f->f_sub_final = value; if( fstr ) { *fstr = ch_realloc( *fstr, - strlen( *fstr ) + val->bv_len + 2 ); + strlen( *fstr ) + value->bv_len + 2 ); strcat( *fstr, "*" ); - strcat( *fstr, val->bv_val ); + strcat( *fstr, value->bv_val ); } break; @@ -486,7 +540,7 @@ get_substring_filter( " unknown substring type=%ld\n", (long) tag, 0, 0 ); - ber_bvfree( val ); + ber_bvfree( value ); return_error: Debug( LDAP_DEBUG_FILTER, " error=%ld\n",