mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename escape_value to filter_escape_value

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-07-02 17:14:37 +00:00
parent 5594efabc0
commit 7ec41919ff
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/filter.c
View File

@ -28,7 +28,7 @@ static int get_substring_filter(
char **fstr, char **fstr,
const char **text ); const char **text );
static int escape_value( static int filter_escape_value(
struct berval *in, struct berval *in,
struct berval *out ); struct berval *out );
@ -107,7 +107,7 @@ get_filter(
assert( f->f_ava != NULL ); assert( f->f_ava != NULL );
escape_value( f->f_av_value, &escaped ); filter_escape_value( f->f_av_value, &escaped );
*fstr = ch_malloc( sizeof("(=)") *fstr = ch_malloc( sizeof("(=)")
+ f->f_av_desc->ad_cname->bv_len + f->f_av_desc->ad_cname->bv_len
@ -133,7 +133,7 @@ get_filter(
break; break;
} }
escape_value( f->f_av_value, &escaped ); filter_escape_value( f->f_av_value, &escaped );
*fstr = ch_malloc( sizeof("(>=)") *fstr = ch_malloc( sizeof("(>=)")
+ f->f_av_desc->ad_cname->bv_len + f->f_av_desc->ad_cname->bv_len
@ -155,7 +155,7 @@ get_filter(
} }
escape_value( f->f_av_value, &escaped ); filter_escape_value( f->f_av_value, &escaped );
*fstr = ch_malloc( sizeof("(<=)") *fstr = ch_malloc( sizeof("(<=)")
+ f->f_av_desc->ad_cname->bv_len + f->f_av_desc->ad_cname->bv_len
@ -204,7 +204,7 @@ get_filter(
break; break;
} }
escape_value( f->f_av_value, &escaped ); filter_escape_value( f->f_av_value, &escaped );
*fstr = ch_malloc( sizeof("(~=)") *fstr = ch_malloc( sizeof("(~=)")
+ f->f_av_desc->ad_cname->bv_len + f->f_av_desc->ad_cname->bv_len
@ -451,7 +451,7 @@ get_substring_filter(
f->f_sub_initial = value; f->f_sub_initial = value;
if( fstr ) { if( fstr ) {
escape_value( value, &escaped ); filter_escape_value( value, &escaped );
*fstr = ch_realloc( *fstr, *fstr = ch_realloc( *fstr,
strlen( *fstr ) + escaped.bv_len + 1 ); strlen( *fstr ) + escaped.bv_len + 1 );
strcat( *fstr, escaped.bv_val ); strcat( *fstr, escaped.bv_val );
@ -467,7 +467,7 @@ get_substring_filter(
} }
if( fstr ) { if( fstr ) {
escape_value( value, &escaped ); filter_escape_value( value, &escaped );
*fstr = ch_realloc( *fstr, *fstr = ch_realloc( *fstr,
strlen( *fstr ) + escaped.bv_len + 2 ); strlen( *fstr ) + escaped.bv_len + 2 );
strcat( *fstr, "*" ); strcat( *fstr, "*" );
@ -485,7 +485,7 @@ get_substring_filter(
f->f_sub_final = value; f->f_sub_final = value;
if( fstr ) { if( fstr ) {
escape_value( value, &escaped ); filter_escape_value( value, &escaped );
*fstr = ch_realloc( *fstr, *fstr = ch_realloc( *fstr,
strlen( *fstr ) + escaped.bv_len + 2 ); strlen( *fstr ) + escaped.bv_len + 2 );
strcat( *fstr, "*" ); strcat( *fstr, "*" );
@ -598,7 +598,7 @@ filter_print( Filter *f )
switch ( f->f_choice ) { switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY: case LDAP_FILTER_EQUALITY:
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 );
@ -606,7 +606,7 @@ filter_print( Filter *f )
break; break;
case LDAP_FILTER_GE: case LDAP_FILTER_GE:
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 );
@ -614,7 +614,7 @@ filter_print( Filter *f )
break; break;
case LDAP_FILTER_LE: case LDAP_FILTER_LE:
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 );
@ -622,7 +622,7 @@ filter_print( Filter *f )
break; break;
case LDAP_FILTER_APPROX: case LDAP_FILTER_APPROX:
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 );
@ -633,21 +633,21 @@ filter_print( Filter *f )
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 != NULL ) {
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] != NULL; i++ ) {
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 != NULL ) {
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 );
@ -688,7 +688,7 @@ filter_print( Filter *f )
#endif /* ldap_debug */ #endif /* ldap_debug */
int escape_value( int filter_escape_value(
struct berval *in, struct berval *in,
struct berval *out ) struct berval *out )
{ {