version 1.57, 2001/01/17 15:35:53
|
version 1.71, 2002/01/06 05:21:30
|
Line 1
|
Line 1
|
/* filter.c - routines for parsing and dealing with filters */ |
/* filter.c - routines for parsing and dealing with filters */ |
/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.56 2001/01/15 18:17:30 gwilliams Exp $ */ |
/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.70 2002/01/06 05:11:01 hyc Exp $ */ |
/* |
/* |
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. |
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
*/ |
*/ |
|
|
Line 18 static int get_filter_list(
|
Line 18 static int get_filter_list(
|
Connection *conn, |
Connection *conn, |
BerElement *ber, |
BerElement *ber, |
Filter **f, |
Filter **f, |
char **fstr, |
struct berval *fstr, |
const char **text ); |
const char **text ); |
|
|
static int get_substring_filter( |
static int get_substring_filter( |
Connection *conn, |
Connection *conn, |
BerElement *ber, |
BerElement *ber, |
Filter *f, |
Filter *f, |
char **fstr, |
struct berval *fstr, |
const char **text ); |
const char **text ); |
|
|
static int filter_escape_value( |
static int filter_escape_value( |
Line 37 get_filter(
|
Line 37 get_filter(
|
Connection *conn, |
Connection *conn, |
BerElement *ber, |
BerElement *ber, |
Filter **filt, |
Filter **filt, |
char **fstr, |
struct berval *fstr, |
const char **text ) |
const char **text ) |
{ |
{ |
ber_tag_t tag; |
ber_tag_t tag; |
ber_len_t len; |
ber_len_t len; |
int err; |
int err; |
Filter *f; |
Filter *f; |
char *ftmp = NULL; |
struct berval ftmp = { 0, NULL }; |
struct berval escaped; |
struct berval escaped; |
|
|
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
Line 97 get_filter(
|
Line 97 get_filter(
|
f->f_next = NULL; |
f->f_next = NULL; |
|
|
err = LDAP_SUCCESS; |
err = LDAP_SUCCESS; |
*fstr = NULL; |
*fstr = ftmp; |
f->f_choice = tag; |
f->f_choice = tag; |
|
|
switch ( f->f_choice ) { |
switch ( f->f_choice ) { |
Line 115 get_filter(
|
Line 115 get_filter(
|
|
|
assert( f->f_ava != NULL ); |
assert( f->f_ava != NULL ); |
|
|
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
|
|
*fstr = ch_malloc( sizeof("(=)") |
fstr->bv_len = sizeof("(=)")-1 |
+ f->f_av_desc->ad_cname->bv_len |
+ f->f_av_desc->ad_cname.bv_len |
+ escaped.bv_len ); |
+ escaped.bv_len; |
|
|
sprintf( *fstr, "(%s=%s)", |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
f->f_av_desc->ad_cname->bv_val, |
|
|
sprintf( fstr->bv_val, "(%s=%s)", |
|
f->f_av_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
|
|
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
Line 150 get_filter(
|
Line 152 get_filter(
|
break; |
break; |
} |
} |
|
|
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
|
|
|
fstr->bv_len = sizeof("(>=)")-1 |
|
+ f->f_av_desc->ad_cname.bv_len |
|
+ escaped.bv_len; |
|
|
*fstr = ch_malloc( sizeof("(>=)") |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
+ f->f_av_desc->ad_cname->bv_len |
|
+ escaped.bv_len ); |
|
|
|
sprintf( *fstr, "(%s>=%s)", |
sprintf( fstr->bv_val, "(%s>=%s)", |
f->f_av_desc->ad_cname->bv_val, |
f->f_av_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
|
|
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
Line 176 get_filter(
|
Line 180 get_filter(
|
} |
} |
|
|
|
|
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
|
|
|
fstr->bv_len = sizeof("(<=)")-1 |
|
+ f->f_av_desc->ad_cname.bv_len |
|
+ escaped.bv_len; |
|
|
*fstr = ch_malloc( sizeof("(<=)") |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
+ f->f_av_desc->ad_cname->bv_len |
|
+ escaped.bv_len ); |
|
|
|
sprintf( *fstr, "(%s<=%s)", |
sprintf( fstr->bv_val, "(%s<=%s)", |
f->f_av_desc->ad_cname->bv_val, |
f->f_av_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
|
|
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
Line 198 get_filter(
|
Line 204 get_filter(
|
#else |
#else |
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 ); |
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 ); |
#endif |
#endif |
if ( ber_scanf( ber, "o", &type ) == LBER_ERROR ) { |
if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) { |
err = SLAPD_DISCONNECT; |
err = SLAPD_DISCONNECT; |
*text = "error decoding filter"; |
*text = "error decoding filter"; |
break; |
break; |
Line 208 get_filter(
|
Line 214 get_filter(
|
err = slap_bv2ad( &type, &f->f_desc, text ); |
err = slap_bv2ad( &type, &f->f_desc, text ); |
|
|
if( err != LDAP_SUCCESS ) { |
if( err != LDAP_SUCCESS ) { |
ch_free( type.bv_val ); |
/* unrecognized attribute description or other error */ |
|
f->f_choice = SLAPD_FILTER_COMPUTED; |
|
f->f_result = LDAP_COMPARE_FALSE; |
|
ber_str2bv("(unrecognized=*)", |
|
sizeof("(unrecognized=*)")-1, 1, fstr); |
|
err = LDAP_SUCCESS; |
break; |
break; |
} |
} |
|
|
ch_free( type.bv_val ); |
fstr->bv_len = sizeof("(=*)") - 1 |
|
+ f->f_desc->ad_cname.bv_len; |
*fstr = ch_malloc( sizeof("(=*)") |
fstr->bv_val = ch_malloc( fstr->bv_len + 1); |
+ f->f_desc->ad_cname->bv_len ); |
sprintf( fstr->bv_val, "(%s=*)", |
sprintf( *fstr, "(%s=*)", |
f->f_desc->ad_cname.bv_val ); |
f->f_desc->ad_cname->bv_val ); |
|
|
|
} break; |
} break; |
|
|
Line 233 get_filter(
|
Line 243 get_filter(
|
break; |
break; |
} |
} |
|
|
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
|
|
*fstr = ch_malloc( sizeof("(~=)") |
fstr->bv_len = sizeof("(~=)") - 1 |
+ f->f_av_desc->ad_cname->bv_len |
+ f->f_av_desc->ad_cname.bv_len |
+ escaped.bv_len ); |
+ escaped.bv_len; |
|
fstr->bv_val = ch_malloc( fstr->bv_len + 1); |
|
|
sprintf( *fstr, "(%s~=%s)", |
sprintf( fstr->bv_val, "(%s~=%s)", |
f->f_av_desc->ad_cname->bv_val, |
f->f_av_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
|
|
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
Line 257 get_filter(
|
Line 268 get_filter(
|
if ( err != LDAP_SUCCESS ) { |
if ( err != LDAP_SUCCESS ) { |
break; |
break; |
} |
} |
*fstr = ch_malloc( sizeof("(&)") |
fstr->bv_len = sizeof("(&)") - 1 + ftmp.bv_len; |
+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) ); |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
sprintf( *fstr, "(&%s)", |
sprintf( fstr->bv_val, "(&%s)", |
ftmp == NULL ? "" : ftmp ); |
ftmp.bv_len ? ftmp.bv_val : "" ); |
break; |
break; |
|
|
case LDAP_FILTER_OR: |
case LDAP_FILTER_OR: |
Line 274 get_filter(
|
Line 285 get_filter(
|
if ( err != LDAP_SUCCESS ) { |
if ( err != LDAP_SUCCESS ) { |
break; |
break; |
} |
} |
*fstr = ch_malloc( sizeof("(!)") |
fstr->bv_len = sizeof("(|)") - 1 + ftmp.bv_len; |
+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) ); |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
sprintf( *fstr, "(|%s)", |
sprintf( fstr->bv_val, "(|%s)", |
ftmp == NULL ? "" : ftmp ); |
ftmp.bv_len ? ftmp.bv_val : "" ); |
break; |
break; |
|
|
case LDAP_FILTER_NOT: |
case LDAP_FILTER_NOT: |
Line 292 get_filter(
|
Line 303 get_filter(
|
if ( err != LDAP_SUCCESS ) { |
if ( err != LDAP_SUCCESS ) { |
break; |
break; |
} |
} |
*fstr = ch_malloc( sizeof("(!)") |
fstr->bv_len = sizeof("(!)") - 1 + ftmp.bv_len; |
+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) ); |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
sprintf( *fstr, "(!%s)", |
sprintf( fstr->bv_val, "(!%s)", |
ftmp == NULL ? "" : ftmp ); |
ftmp.bv_len ? ftmp.bv_val : "" ); |
break; |
break; |
|
|
case LDAP_FILTER_EXT: |
case LDAP_FILTER_EXT: |
Line 313 get_filter(
|
Line 324 get_filter(
|
|
|
assert( f->f_mra != NULL ); |
assert( f->f_mra != NULL ); |
|
|
filter_escape_value( f->f_mr_value, &escaped ); |
filter_escape_value( &f->f_mr_value, &escaped ); |
|
|
*fstr = ch_malloc( sizeof("(:dn::=)") |
fstr->bv_len = sizeof("(:dn::=)") - 1 |
+ (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_len : 0) |
+ (f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_len : 0) |
+ (f->f_mr_rule_text ? strlen(f->f_mr_rule_text) : 0) |
+ f->f_mr_rule_text.bv_len |
+ escaped.bv_len ); |
+ escaped.bv_len; |
|
|
sprintf( *fstr, "(%s%s%s%s:=%s)", |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
(f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_val : ""), |
sprintf( fstr->bv_val, "(%s%s%s%s:=%s)", |
|
(f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_val : ""), |
(f->f_mr_dnattrs ? ":dn" : ""), |
(f->f_mr_dnattrs ? ":dn" : ""), |
(f->f_mr_rule_text ? ":" : ""), |
(f->f_mr_rule_text.bv_len ? ":" : ""), |
(f->f_mr_rule_text ? f->f_mr_rule_text : ""), |
(f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : ""), |
escaped.bv_val ); |
escaped.bv_val ); |
|
|
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
break; |
break; |
|
|
default: |
default: |
(void) ber_skip_tag( ber, &len ); |
(void) ber_scanf( ber, "x" ); /* skip the element */ |
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
LDAP_LOG(( "filter", LDAP_LEVEL_ERR, |
LDAP_LOG(( "filter", LDAP_LEVEL_ERR, |
"get_filter: conn %d unknown filter type=%lu\n", |
"get_filter: conn %d unknown filter type=%lu\n", |
Line 342 get_filter(
|
Line 354 get_filter(
|
#endif |
#endif |
f->f_choice = SLAPD_FILTER_COMPUTED; |
f->f_choice = SLAPD_FILTER_COMPUTED; |
f->f_result = SLAPD_COMPARE_UNDEFINED; |
f->f_result = SLAPD_COMPARE_UNDEFINED; |
*fstr = ch_strdup( "(undefined)" ); |
ber_str2bv( "(undefined)", sizeof("(undefined)") - 1, |
|
1, fstr ); |
break; |
break; |
} |
} |
|
|
free( ftmp ); |
if ( ftmp.bv_val ) free( ftmp.bv_val ); |
|
|
if ( err != LDAP_SUCCESS ) { |
if ( err != LDAP_SUCCESS ) { |
if ( *fstr != NULL ) { |
if ( fstr->bv_val != NULL ) { |
free( *fstr ); |
free( fstr->bv_val ); |
} |
} |
|
|
if( err != SLAPD_DISCONNECT ) { |
if( err != SLAPD_DISCONNECT ) { |
/* ignore error */ |
/* ignore error */ |
f->f_choice = SLAPD_FILTER_COMPUTED; |
f->f_choice = SLAPD_FILTER_COMPUTED; |
f->f_result = SLAPD_COMPARE_UNDEFINED; |
f->f_result = SLAPD_COMPARE_UNDEFINED; |
*fstr = ch_strdup( "(badfilter)" ); |
ber_str2bv( "(badfilter)", sizeof("(badfilter)") - 1, |
|
1, fstr ); |
err = LDAP_SUCCESS; |
err = LDAP_SUCCESS; |
*filt = f; |
*filt = f; |
|
|
Line 370 get_filter(
|
Line 384 get_filter(
|
|
|
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, |
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2, |
"get_filter: conn %d exit\n", conn->c_connid )); |
"get_filter: conn %d exit\n", conn->c_connid )); |
#else |
#else |
Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 ); |
Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 ); |
#endif |
#endif |
Line 379 get_filter(
|
Line 393 get_filter(
|
|
|
static int |
static int |
get_filter_list( Connection *conn, BerElement *ber, |
get_filter_list( Connection *conn, BerElement *ber, |
Filter **f, char **fstr, |
Filter **f, struct berval *fstr, |
const char **text ) |
const char **text ) |
{ |
{ |
Filter **new; |
Filter **new; |
int err; |
int err; |
ber_tag_t tag; |
ber_tag_t tag; |
ber_len_t len; |
ber_len_t len; |
char *last, *ftmp; |
char *last; |
|
struct berval ftmp; |
|
|
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, |
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, |
Line 394 get_filter_list( Connection *conn, BerEl
|
Line 409 get_filter_list( Connection *conn, BerEl
|
#else |
#else |
Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 ); |
Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 ); |
#endif |
#endif |
*fstr = NULL; |
|
new = f; |
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 ) ) |
tag = ber_next_element( ber, &len, last ) ) |
Line 403 get_filter_list( Connection *conn, BerEl
|
Line 417 get_filter_list( Connection *conn, BerEl
|
if ( err != LDAP_SUCCESS ) |
if ( err != LDAP_SUCCESS ) |
return( err ); |
return( err ); |
|
|
if ( *fstr == NULL ) { |
if ( !fstr->bv_len ) { |
*fstr = ftmp; |
*fstr = ftmp; |
} else { |
} else { |
*fstr = ch_realloc( *fstr, strlen( *fstr ) + |
int i = fstr->bv_len; |
strlen( ftmp ) + 1 ); |
fstr->bv_len += ftmp.bv_len; |
strcat( *fstr, ftmp ); |
fstr->bv_val = ch_realloc( fstr->bv_val, |
free( ftmp ); |
fstr->bv_len + 1 ); |
|
strcpy( fstr->bv_val+i, ftmp.bv_val ); |
|
free( ftmp.bv_val ); |
} |
} |
new = &(*new)->f_next; |
new = &(*new)->f_next; |
} |
} |
Line 429 get_substring_filter(
|
Line 445 get_substring_filter(
|
Connection *conn, |
Connection *conn, |
BerElement *ber, |
BerElement *ber, |
Filter *f, |
Filter *f, |
char **fstr, |
struct berval *fstr, |
const char **text |
const char **text |
) |
) |
{ |
{ |
ber_tag_t tag; |
ber_tag_t tag; |
ber_len_t len; |
ber_len_t len; |
ber_tag_t rc; |
ber_tag_t rc; |
struct berval *value; |
struct berval value; |
struct berval escaped; |
struct berval escaped; |
char *last; |
char *last; |
struct berval type; |
struct berval bv; |
struct berval *nvalue; |
|
*text = "error decoding filter"; |
*text = "error decoding filter"; |
|
|
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
Line 449 get_substring_filter(
|
Line 464 get_substring_filter(
|
#else |
#else |
Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 ); |
Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 ); |
#endif |
#endif |
if ( ber_scanf( ber, "{o" /*}*/, &type ) == LBER_ERROR ) { |
if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) { |
return SLAPD_DISCONNECT; |
return SLAPD_DISCONNECT; |
} |
} |
|
|
f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) ); |
f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) ); |
f->f_sub_desc = NULL; |
f->f_sub_desc = NULL; |
rc = slap_bv2ad( &type, &f->f_sub_desc, text ); |
rc = slap_bv2ad( &bv, &f->f_sub_desc, text ); |
|
|
ch_free( type.bv_val ); |
|
|
|
if( rc != LDAP_SUCCESS ) { |
if( rc != LDAP_SUCCESS ) { |
text = NULL; |
text = NULL; |
ch_free( f->f_sub ); |
ch_free( f->f_sub ); |
f->f_choice = SLAPD_FILTER_COMPUTED; |
f->f_choice = SLAPD_FILTER_COMPUTED; |
f->f_result = SLAPD_COMPARE_UNDEFINED; |
f->f_result = SLAPD_COMPARE_UNDEFINED; |
*fstr = ch_strdup( "(undefined)" ); |
ber_str2bv( "(undefined)", sizeof("(undefined)")-1, 1, fstr ); |
return LDAP_SUCCESS; |
return LDAP_SUCCESS; |
} |
} |
|
|
f->f_sub_initial = NULL; |
f->f_sub_initial.bv_val = NULL; |
f->f_sub_any = NULL; |
f->f_sub_any = NULL; |
f->f_sub_final = NULL; |
f->f_sub_final.bv_val = NULL; |
|
|
if( fstr ) { |
fstr->bv_len = sizeof("(=" /*)*/) - 1 + |
*fstr = ch_malloc( sizeof("(=" /*)*/) + |
f->f_sub_desc->ad_cname.bv_len; |
f->f_sub_desc->ad_cname->bv_len ); |
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); |
sprintf( *fstr, "(%s=" /*)*/, f->f_sub_desc->ad_cname->bv_val ); |
sprintf( fstr->bv_val, "(%s=" /*)*/, f->f_sub_desc->ad_cname.bv_val ); |
} |
|
|
|
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 ) ) |
tag = ber_next_element( ber, &len, last ) ) |
{ |
{ |
unsigned usage; |
unsigned usage; |
|
|
rc = ber_scanf( ber, "O", &value ); |
rc = ber_scanf( ber, "m", &value ); |
if ( rc == LBER_ERROR ) { |
if ( rc == LBER_ERROR ) { |
rc = SLAPD_DISCONNECT; |
rc = SLAPD_DISCONNECT; |
goto return_error; |
goto return_error; |
} |
} |
|
|
if ( value == NULL || value->bv_len == 0 ) { |
if ( value.bv_val == NULL || value.bv_len == 0 ) { |
ber_bvfree( value ); |
|
rc = LDAP_INVALID_SYNTAX; |
rc = LDAP_INVALID_SYNTAX; |
goto return_error; |
goto return_error; |
} |
} |
Line 520 get_substring_filter(
|
Line 531 get_substring_filter(
|
" unknown substring choice=%ld\n", |
" unknown substring choice=%ld\n", |
(long) tag, 0, 0 ); |
(long) tag, 0, 0 ); |
#endif |
#endif |
ber_bvfree( value ); |
|
goto return_error; |
goto return_error; |
} |
} |
|
|
rc = value_normalize( f->f_sub_desc, usage, value, &nvalue, text ); |
rc = value_normalize( f->f_sub_desc, usage, &value, &bv, text ); |
ber_bvfree( value ); |
|
|
|
if( rc != LDAP_SUCCESS ) { |
if( rc != LDAP_SUCCESS ) { |
goto return_error; |
goto return_error; |
} |
} |
|
|
value = nvalue; |
value = bv; |
|
|
rc = LDAP_PROTOCOL_ERROR; |
rc = LDAP_PROTOCOL_ERROR; |
|
|
Line 544 get_substring_filter(
|
Line 553 get_substring_filter(
|
#else |
#else |
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); |
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 ); |
#endif |
#endif |
if ( f->f_sub_initial != NULL ) { |
|
ber_bvfree( value ); |
if ( f->f_sub_initial.bv_val != NULL |
|
|| f->f_sub_any != NULL |
|
|| f->f_sub_final.bv_val != NULL ) |
|
{ |
|
free( value.bv_val ); |
goto return_error; |
goto return_error; |
} |
} |
|
|
f->f_sub_initial = value; |
f->f_sub_initial = value; |
|
|
if( fstr ) { |
if( fstr->bv_val ) { |
filter_escape_value( value, &escaped ); |
int i = fstr->bv_len; |
*fstr = ch_realloc( *fstr, |
filter_escape_value( &value, &escaped ); |
strlen( *fstr ) + escaped.bv_len + 1 ); |
fstr->bv_len += escaped.bv_len; |
strcat( *fstr, escaped.bv_val ); |
fstr->bv_val = ch_realloc( fstr->bv_val, |
|
fstr->bv_len + 1 ); |
|
strcpy( fstr->bv_val+i, escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
} |
} |
break; |
break; |
Line 568 get_substring_filter(
|
Line 583 get_substring_filter(
|
#else |
#else |
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); |
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); |
#endif |
#endif |
if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) { |
|
ber_bvfree( value ); |
if ( f->f_sub_final.bv_val != NULL ) { |
|
free( value.bv_val ); |
goto return_error; |
goto return_error; |
} |
} |
|
|
if( fstr ) { |
bvarray_add( &f->f_sub_any, &value ); |
filter_escape_value( value, &escaped ); |
|
*fstr = ch_realloc( *fstr, |
if( fstr->bv_val ) { |
strlen( *fstr ) + escaped.bv_len + 2 ); |
int i = fstr->bv_len; |
strcat( *fstr, "*" ); |
filter_escape_value( &value, &escaped ); |
strcat( *fstr, escaped.bv_val ); |
fstr->bv_len += escaped.bv_len + 2; |
|
fstr->bv_val = ch_realloc( fstr->bv_val, |
|
fstr->bv_len + 1 ); |
|
strcpy( fstr->bv_val+i, "*" ); |
|
strcpy( fstr->bv_val+i+1, escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
} |
} |
break; |
break; |
Line 591 get_substring_filter(
|
Line 611 get_substring_filter(
|
#else |
#else |
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); |
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 ); |
#endif |
#endif |
if ( f->f_sub_final != NULL ) { |
|
ber_bvfree( value ); |
if ( f->f_sub_final.bv_val != NULL ) { |
|
free( value.bv_val ); |
goto return_error; |
goto return_error; |
} |
} |
|
|
f->f_sub_final = value; |
f->f_sub_final = value; |
|
|
if( fstr ) { |
if( fstr->bv_val ) { |
filter_escape_value( value, &escaped ); |
int i = fstr->bv_len; |
*fstr = ch_realloc( *fstr, |
filter_escape_value( &value, &escaped ); |
strlen( *fstr ) + escaped.bv_len + 2 ); |
fstr->bv_len += escaped.bv_len + 2; |
strcat( *fstr, "*" ); |
fstr->bv_val = ch_realloc( fstr->bv_val, |
strcat( *fstr, escaped.bv_val ); |
fstr->bv_len + 1 ); |
|
strcpy( fstr->bv_val+i, "*" ); |
|
strcpy( fstr->bv_val+i+1, escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
} |
} |
break; |
break; |
Line 618 get_substring_filter(
|
Line 642 get_substring_filter(
|
(long) tag, 0, 0 ); |
(long) tag, 0, 0 ); |
#endif |
#endif |
|
|
ber_bvfree( value ); |
free( value.bv_val ); |
|
|
return_error: |
return_error: |
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
Line 629 return_error:
|
Line 653 return_error:
|
Debug( LDAP_DEBUG_FILTER, " error=%ld\n", |
Debug( LDAP_DEBUG_FILTER, " error=%ld\n", |
(long) rc, 0, 0 ); |
(long) rc, 0, 0 ); |
#endif |
#endif |
if( fstr ) { |
if( fstr->bv_val ) { |
free( *fstr ); |
free( fstr->bv_val ); |
*fstr = NULL; |
fstr->bv_val = NULL; |
|
fstr->bv_len = 0; |
} |
} |
|
|
ad_free( f->f_sub_desc, 1 ); |
free( f->f_sub_initial.bv_val ); |
ber_bvfree( f->f_sub_initial ); |
bvarray_free( f->f_sub_any ); |
ber_bvecfree( f->f_sub_any ); |
free( f->f_sub_final.bv_val ); |
ber_bvfree( f->f_sub_final ); |
|
ch_free( f->f_sub ); |
ch_free( f->f_sub ); |
return rc; |
return rc; |
} |
} |
} |
} |
|
|
if( fstr ) { |
if( fstr->bv_val ) { |
*fstr = ch_realloc( *fstr, strlen( *fstr ) + 3 ); |
int i = fstr->bv_len; |
if ( f->f_sub_final == NULL ) { |
fstr->bv_len += 3; |
strcat( *fstr, "*" ); |
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 3 ); |
|
if ( f->f_sub_final.bv_val == NULL ) { |
|
strcpy( fstr->bv_val+i, "*" ); |
|
i++; |
} |
} |
strcat( *fstr, /*(*/ ")" ); |
strcpy( fstr->bv_val+i, /*(*/ ")" ); |
} |
} |
|
|
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
Line 671 filter_free( Filter *f )
|
Line 698 filter_free( Filter *f )
|
|
|
switch ( f->f_choice ) { |
switch ( f->f_choice ) { |
case LDAP_FILTER_PRESENT: |
case LDAP_FILTER_PRESENT: |
ad_free( f->f_desc, 1 ); |
|
break; |
break; |
|
|
case LDAP_FILTER_EQUALITY: |
case LDAP_FILTER_EQUALITY: |
Line 682 filter_free( Filter *f )
|
Line 708 filter_free( Filter *f )
|
break; |
break; |
|
|
case LDAP_FILTER_SUBSTRINGS: |
case LDAP_FILTER_SUBSTRINGS: |
ad_free( f->f_sub_desc, 1 ); |
if ( f->f_sub_initial.bv_val != NULL ) { |
if ( f->f_sub_initial != NULL ) { |
free( f->f_sub_initial.bv_val ); |
ber_bvfree( f->f_sub_initial ); |
} |
} |
bvarray_free( f->f_sub_any ); |
ber_bvecfree( f->f_sub_any ); |
if ( f->f_sub_final.bv_val != NULL ) { |
if ( f->f_sub_final != NULL ) { |
free( f->f_sub_final.bv_val ); |
ber_bvfree( f->f_sub_final ); |
|
} |
} |
|
ch_free( f->f_sub ); |
break; |
break; |
|
|
case LDAP_FILTER_AND: |
case LDAP_FILTER_AND: |
Line 701 filter_free( Filter *f )
|
Line 727 filter_free( Filter *f )
|
} |
} |
break; |
break; |
|
|
|
case LDAP_FILTER_EXT: |
|
mra_free( f->f_mra, 1 ); |
|
break; |
|
|
case SLAPD_FILTER_COMPUTED: |
case SLAPD_FILTER_COMPUTED: |
break; |
break; |
|
|
Line 732 filter_print( Filter *f )
|
Line 762 filter_print( Filter *f )
|
|
|
switch ( f->f_choice ) { |
switch ( f->f_choice ) { |
case LDAP_FILTER_EQUALITY: |
case LDAP_FILTER_EQUALITY: |
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
fprintf( stderr, "(%s=%s)", |
fprintf( stderr, "(%s=%s)", |
f->f_av_desc->ad_cname->bv_val, |
f->f_av_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
break; |
break; |
|
|
case LDAP_FILTER_GE: |
case LDAP_FILTER_GE: |
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
fprintf( stderr, "(%s>=%s)", |
fprintf( stderr, "(%s>=%s)", |
f->f_av_desc->ad_cname->bv_val, |
f->f_av_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
break; |
break; |
|
|
case LDAP_FILTER_LE: |
case LDAP_FILTER_LE: |
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
fprintf( stderr, "(%s<=%s)", |
fprintf( stderr, "(%s<=%s)", |
f->f_ava->aa_desc->ad_cname->bv_val, |
f->f_ava->aa_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
break; |
break; |
|
|
case LDAP_FILTER_APPROX: |
case LDAP_FILTER_APPROX: |
filter_escape_value( f->f_av_value, &escaped ); |
filter_escape_value( &f->f_av_value, &escaped ); |
fprintf( stderr, "(%s~=%s)", |
fprintf( stderr, "(%s~=%s)", |
f->f_ava->aa_desc->ad_cname->bv_val, |
f->f_ava->aa_desc->ad_cname.bv_val, |
escaped.bv_val ); |
escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
break; |
break; |
|
|
case LDAP_FILTER_SUBSTRINGS: |
case LDAP_FILTER_SUBSTRINGS: |
fprintf( stderr, "(%s=" /*)*/, |
fprintf( stderr, "(%s=" /*)*/, |
f->f_sub_desc->ad_cname->bv_val ); |
f->f_sub_desc->ad_cname.bv_val ); |
if ( f->f_sub_initial != NULL ) { |
if ( f->f_sub_initial.bv_val != NULL ) { |
filter_escape_value( f->f_sub_initial, &escaped ); |
filter_escape_value( &f->f_sub_initial, &escaped ); |
fprintf( stderr, "%s", |
fprintf( stderr, "%s", |
escaped.bv_val ); |
escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
} |
} |
if ( f->f_sub_any != NULL ) { |
if ( f->f_sub_any != NULL ) { |
for ( i = 0; f->f_sub_any[i] != NULL; i++ ) { |
for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) { |
filter_escape_value( f->f_sub_any[i], &escaped ); |
filter_escape_value( &f->f_sub_any[i], &escaped ); |
fprintf( stderr, "*%s", |
fprintf( stderr, "*%s", |
escaped.bv_val ); |
escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
} |
} |
} |
} |
if ( f->f_sub_final != NULL ) { |
if ( f->f_sub_final.bv_val != NULL ) { |
filter_escape_value( f->f_sub_final, &escaped ); |
filter_escape_value( &f->f_sub_final, &escaped ); |
fprintf( stderr, |
fprintf( stderr, |
"*%s", escaped.bv_val ); |
"*%s", escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
ber_memfree( escaped.bv_val ); |
Line 791 filter_print( Filter *f )
|
Line 821 filter_print( Filter *f )
|
|
|
case LDAP_FILTER_PRESENT: |
case LDAP_FILTER_PRESENT: |
fprintf( stderr, "(%s=*)", |
fprintf( stderr, "(%s=*)", |
f->f_desc->ad_cname->bv_val ); |
f->f_desc->ad_cname.bv_val ); |
break; |
break; |
|
|
case LDAP_FILTER_AND: |
case LDAP_FILTER_AND: |
Line 822 filter_print( Filter *f )
|
Line 852 filter_print( Filter *f )
|
|
|
#endif /* ldap_debug */ |
#endif /* ldap_debug */ |
|
|
int filter_escape_value( |
static int filter_escape_value( |
struct berval *in, |
struct berval *in, |
struct berval *out ) |
struct berval *out ) |
{ |
{ |