BerElement *ber,
Filter **f,
char **fstr,
- char **text );
+ const char **text );
+
static int get_substring_filter(
Connection *conn,
BerElement *ber,
Filter *f,
char **fstr,
- char **text );
+ const char **text );
int
get_filter(
BerElement *ber,
Filter **filt,
char **fstr,
- char **text )
+ const char **text )
{
ber_tag_t tag;
ber_len_t len;
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";
+ err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text );
+ 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 );
f->f_av_desc->ad_cname->bv_val,
f->f_av_value->bv_val );
-#else
- *fstr = ch_malloc( sizeof("(=)")
- + strlen( f->f_avtype )
- + f->f_avvalue.bv_len);
- sprintf( *fstr, "(%s=%s)", f->f_avtype,
- f->f_avvalue.bv_val );
-#endif
break;
case LDAP_FILTER_SUBSTRINGS:
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";
+ err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
+ if ( err != LDAP_SUCCESS ) {
break;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
*fstr = ch_malloc( sizeof("(>=)")
+ f->f_av_desc->ad_cname->bv_len
+ f->f_av_value->bv_len );
f->f_av_desc->ad_cname->bv_val,
f->f_av_value->bv_val );
-#else
- *fstr = ch_malloc( sizeof("(>=)")
- + strlen( f->f_avtype )
- + f->f_avvalue.bv_len);
- sprintf( *fstr, "(%s>=%s)", f->f_avtype,
- f->f_avvalue.bv_val );
-#endif
break;
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";
+ err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
+ if ( err != LDAP_SUCCESS ) {
break;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+
*fstr = ch_malloc( sizeof("(<=)")
+ f->f_av_desc->ad_cname->bv_len
+ f->f_av_value->bv_len );
f->f_av_desc->ad_cname->bv_val,
f->f_av_value->bv_val );
-#else
- *fstr = ch_malloc( sizeof("(<=)")
- + strlen( f->f_avtype )
- + f->f_avvalue.bv_len);
- sprintf( *fstr, "(%s<=%s)", f->f_avtype,
- f->f_avvalue.bv_val );
-#endif
break;
case LDAP_FILTER_PRESENT: {
break;
}
-#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=*)",
f->f_desc->ad_cname->bv_val );
-#else
- f->f_type = type.bv_val;
- err = LDAP_SUCCESS;
- attr_normalize( f->f_type );
- *fstr = ch_malloc( sizeof("(=*)")
- + strlen( f->f_type ) );
- sprintf( *fstr, "(%s=*)", f->f_type );
-#endif
} break;
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";
+ err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text );
+ if ( err != LDAP_SUCCESS ) {
break;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
*fstr = ch_malloc( sizeof("(~=)")
+ f->f_av_desc->ad_cname->bv_len
+ f->f_av_value->bv_len );
f->f_av_desc->ad_cname->bv_val,
f->f_av_value->bv_val );
-#else
- *fstr = ch_malloc( sizeof("(~=)")
- + strlen( f->f_avtype )
- + f->f_avvalue.bv_len);
- sprintf( *fstr, "(%s~=%s)", f->f_avtype,
- f->f_avvalue.bv_val );
-#endif
break;
case LDAP_FILTER_AND:
/* not yet implemented */
Debug( LDAP_DEBUG_ANY, "extensible match not yet implemented.\n",
f->f_choice, 0, 0 );
+ (void) ber_skip_tag( ber, &len );
f->f_choice = SLAPD_FILTER_COMPUTED;
f->f_result = SLAPD_COMPARE_UNDEFINED;
*fstr = ch_strdup( "(extended)" );
break;
default:
+ (void) ber_skip_tag( ber, &len );
Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
f->f_choice, 0, 0 );
f->f_choice = SLAPD_FILTER_COMPUTED;
break;
}
+ free( ftmp );
+
if ( err != LDAP_SUCCESS ) {
- free( (char *) f );
if ( *fstr != NULL ) {
free( *fstr );
}
+
+ if( err != SLAPD_DISCONNECT ) {
+ /* ignore error */
+ f->f_choice = SLAPD_FILTER_COMPUTED;
+ f->f_result = SLAPD_COMPARE_UNDEFINED;
+ *fstr = ch_strdup( "(badfilter)" );
+ err = LDAP_SUCCESS;
+ *filt = f;
+
+ } else {
+ free(f);
+ }
} else {
*filt = f;
}
- free( ftmp );
-
Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
return( err );
}
static int
-get_filter_list( Connection *conn, BerElement *ber, Filter **f, char **fstr, char **text )
+get_filter_list( Connection *conn, BerElement *ber,
+ Filter **f, char **fstr,
+ const char **text )
{
Filter **new;
int err;
BerElement *ber,
Filter *f,
char **fstr,
- char **text
+ const char **text
)
{
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;
-#endif
+ struct berval *nvalue;
*text = "error decoding filter";
Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
return SLAPD_DISCONNECT;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) );
+ f->f_sub_desc = NULL;
rc = slap_bv2ad( &type, &f->f_sub_desc, text );
ch_free( type.bv_val );
if( rc != LDAP_SUCCESS ) {
text = NULL;
+ ch_free( f->f_sub );
f->f_choice = SLAPD_FILTER_COMPUTED;
f->f_result = SLAPD_COMPARE_UNDEFINED;
*fstr = ch_strdup( "(undefined)" );
return LDAP_SUCCESS;
}
-#else
- f->f_sub_type = type.bv_val;
- attr_normalize( f->f_sub_type );
-
- /* should get real syntax and see if we have a substring matching rule */
- syntax = attr_syntax( f->f_sub_type );
-#endif
f->f_sub_initial = NULL;
f->f_sub_any = NULL;
f->f_sub_final = NULL;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
if( fstr ) {
*fstr = ch_malloc( sizeof("(=" /*)*/) +
f->f_sub_desc->ad_cname->bv_len );
sprintf( *fstr, "(%s=" /*)*/, f->f_sub_desc->ad_cname->bv_val );
}
-#else
- if( fstr ) {
- *fstr = ch_malloc( strlen( f->f_sub_type ) + 3 );
- sprintf( *fstr, "(%s=" /*)*/, f->f_sub_type );
- }
-#endif
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;
+ switch ( tag ) {
+ case LDAP_SUBSTRING_INITIAL:
+ usage = SLAP_MR_SUBSTR_INITIAL;
+ break;
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
- /* we should call a substring syntax normalization routine */
- value_normalize( val->bv_val, syntax );
- /* this is bogus, value_normalize should take a berval */
- val->bv_len = strlen( val->bv_val );
-#endif
+ 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;
+
+ 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;
" unknown substring type=%ld\n",
(long) tag, 0, 0 );
- ber_bvfree( val );
+ ber_bvfree( value );
return_error:
Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
*fstr = NULL;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
ad_free( f->f_sub_desc, 1 );
-#else
- ch_free( f->f_sub_type );
-#endif
ber_bvfree( f->f_sub_initial );
ber_bvecfree( f->f_sub_any );
ber_bvfree( f->f_sub_final );
+ ch_free( f->f_sub );
return rc;
}
}
switch ( f->f_choice ) {
case LDAP_FILTER_PRESENT:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
ad_free( f->f_desc, 1 );
-#else
- if ( f->f_type != NULL ) {
- free( f->f_type );
- }
-#endif
break;
case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_GE:
case LDAP_FILTER_LE:
case LDAP_FILTER_APPROX:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
ava_free( f->f_ava, 1 );
-#else
- ava_free( &f->f_ava, 0 );
-#endif
break;
case LDAP_FILTER_SUBSTRINGS:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
ad_free( f->f_sub_desc, 1 );
if ( f->f_sub_initial != NULL ) {
ber_bvfree( f->f_sub_initial );
if ( f->f_sub_final != NULL ) {
ber_bvfree( f->f_sub_final );
}
-#else
- if ( f->f_sub_type != NULL ) {
- free( f->f_sub_type );
- }
- if ( f->f_sub_initial != NULL ) {
- ber_bvfree( f->f_sub_initial );
- }
- ber_bvecfree( f->f_sub_any );
- if ( f->f_sub_final != NULL ) {
- ber_bvfree( f->f_sub_final );
- }
-#endif
break;
case LDAP_FILTER_AND:
switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
fprintf( stderr, "(%s=%s)",
f->f_av_desc->ad_cname->bv_val,
f->f_av_value->bv_val );
-#else
- fprintf( stderr, "(%s=%s)",
- f->f_ava.ava_type,
- f->f_ava.ava_value.bv_val );
-#endif
break;
case LDAP_FILTER_GE:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
fprintf( stderr, "(%s>=%s)",
f->f_av_desc->ad_cname->bv_val,
f->f_av_value->bv_val );
-#else
- fprintf( stderr, "(%s>=%s)",
- f->f_ava.ava_type,
- f->f_ava.ava_value.bv_val );
-#endif
break;
case LDAP_FILTER_LE:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
fprintf( stderr, "(%s<=%s)",
f->f_ava->aa_desc->ad_cname->bv_val,
f->f_ava->aa_value->bv_val );
-#else
- fprintf( stderr, "(%s<=%s)",
- f->f_ava.ava_type,
- f->f_ava.ava_value.bv_val );
-#endif
break;
case LDAP_FILTER_APPROX:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
fprintf( stderr, "(%s~=%s)",
f->f_ava->aa_desc->ad_cname->bv_val,
f->f_ava->aa_value->bv_val );
-#else
- fprintf( stderr, "(%s~=%s)",
- f->f_ava.ava_type,
- f->f_ava.ava_value.bv_val );
-#endif
break;
case LDAP_FILTER_SUBSTRINGS:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
fprintf( stderr, "(%s=" /*)*/,
f->f_sub_desc->ad_cname->bv_val );
-#else
- fprintf( stderr, "(%s=" /*)*/,
- f->f_sub_type );
-#endif
if ( f->f_sub_initial != NULL ) {
fprintf( stderr, "%s",
f->f_sub_initial->bv_val );
break;
case LDAP_FILTER_PRESENT:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
fprintf( stderr, "(%s=*)",
f->f_desc->ad_cname->bv_val );
-#else
- fprintf( stderr, "(%s=*)",
- f->f_type );
-#endif
break;
case LDAP_FILTER_AND:
projects / openldap / blobdiff