version 1.101, 2003/03/17 05:06:02
|
version 1.102, 2003/03/18 13:38:40
|
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.100 2003/03/16 23:27:33 kurt Exp $ */ |
/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.101 2003/03/17 05:06:02 kurt Exp $ */ |
/* |
/* |
* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. |
* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
Line 396 get_ssa(
|
Line 396 get_ssa(
|
} |
} |
|
|
if ( value.bv_val == NULL || value.bv_len == 0 ) { |
if ( value.bv_val == NULL || value.bv_len == 0 ) { |
free( value.bv_val ); |
|
rc = LDAP_INVALID_SYNTAX; |
rc = LDAP_INVALID_SYNTAX; |
goto return_error; |
goto return_error; |
} |
} |
Line 427 get_ssa(
|
Line 426 get_ssa(
|
(long) tag, 0, 0 ); |
(long) tag, 0, 0 ); |
#endif |
#endif |
|
|
free( value.bv_val ); |
|
goto return_error; |
goto return_error; |
} |
} |
|
|
Line 438 get_ssa(
|
Line 436 get_ssa(
|
usage, &value, &nvalue, text ); |
usage, &value, &nvalue, text ); |
|
|
if( rc != LDAP_SUCCESS ) { |
if( rc != LDAP_SUCCESS ) { |
free( value.bv_val ); |
|
goto return_error; |
goto return_error; |
} |
} |
#else |
#else |
Line 446 get_ssa(
|
Line 443 get_ssa(
|
rc = value_validate( ssa.sa_desc->ad_type->sat_equality, |
rc = value_validate( ssa.sa_desc->ad_type->sat_equality, |
&value, text ); |
&value, text ); |
if( rc != LDAP_SUCCESS ) { |
if( rc != LDAP_SUCCESS ) { |
free( value.bv_val ); |
|
goto return_error; |
goto return_error; |
} |
} |
|
|
rc = value_normalize( ssa.sa_desc, usage, |
rc = value_normalize( ssa.sa_desc, usage, |
&value, &nvalue, text ); |
&value, &nvalue, text ); |
|
|
free( value.bv_val ); |
|
|
|
if( rc != LDAP_SUCCESS ) { |
if( rc != LDAP_SUCCESS ) { |
goto return_error; |
goto return_error; |
} |
} |
Line 1378 simple_vrFilter2bv( ValuesReturnFilter *
|
Line 1372 simple_vrFilter2bv( ValuesReturnFilter *
|
} |
} |
} |
} |
|
|
|
#if 0 /* unused */ |
static int |
static int |
get_substring_vrFilter( |
get_substring_vrFilter( |
Connection *conn, |
Connection *conn, |
Line 1391 get_substring_vrFilter(
|
Line 1386 get_substring_vrFilter(
|
struct berval value; |
struct berval value; |
char *last; |
char *last; |
struct berval bv; |
struct berval bv; |
SubstringsAssertion ssa; |
|
*text = "error decoding filter"; |
*text = "error decoding filter"; |
|
|
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
Line 1582 return_error:
|
Line 1576 return_error:
|
#endif |
#endif |
return( LDAP_SUCCESS ); |
return( LDAP_SUCCESS ); |
} |
} |
|
#endif /* unused */ |