upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2004-12-07 18:40:47 +00:00
parent d3d73a0b96
commit d616bd4ff8
7 changed files with 61 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/slapd/filterentry.c
View file

@ -209,17 +209,18 @@ static int test_mra_filter(
#ifdef LDAP_COMP_MATCH #ifdef LDAP_COMP_MATCH
/* Component Matching */ /* Component Matching */
if( mra->ma_cf && mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) { if( mra->ma_cf &&
mra->ma_rule->smr_usage & SLAP_MR_COMPONENT )
{
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
(struct berval *)a,(void*) mra , &text ); (struct berval *)a,(void*) mra , &text );
} } else
else {
#endif #endif
{
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
bv, &mra->ma_value, &text ); bv, &mra->ma_value, &text );
#ifdef LDAP_COMP_MATCH
} }
#endif
if( rc != LDAP_SUCCESS ) return rc; if( rc != LDAP_SUCCESS ) return rc;
if ( ret == 0 ) return LDAP_COMPARE_TRUE; if ( ret == 0 ) return LDAP_COMPARE_TRUE;
} }
@ -265,18 +266,17 @@ static int test_mra_filter(
#ifdef LDAP_COMP_MATCH #ifdef LDAP_COMP_MATCH
/* Component Matching */ /* Component Matching */
if( mra->ma_cf && if( mra->ma_cf &&
mra->ma_rule->smr_usage & SLAP_MR_COMPONENT) { mra->ma_rule->smr_usage & SLAP_MR_COMPONENT)
{
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
(struct berval*)a, (void*)mra, &text ); (struct berval*)a, (void*)mra, &text );
} } else
else {
#endif #endif
{
rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
bv, &value, &text ); bv, &value, &text );
#ifdef LDAP_COMP_MATCH
} }
#endif
if( rc != LDAP_SUCCESS ) break; if( rc != LDAP_SUCCESS ) break;
if ( ret == 0 ) { if ( ret == 0 ) {

3
servers/slapd/mra.c
View file

@ -31,8 +31,9 @@ mra_free(
{ {
#ifdef LDAP_COMP_MATCH #ifdef LDAP_COMP_MATCH
/* free component assertion */ /* free component assertion */
if ( mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) if ( mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) {
component_free( mra->ma_cf ); component_free( mra->ma_cf );
}
#endif #endif
/* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */ /* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */
ch_free( mra->ma_value.bv_val ); ch_free( mra->ma_value.bv_val );

1
servers/slapd/proto-slap.h
View file

@ -375,7 +375,6 @@ LDAP_SLAPD_F (int) componentFilterValidate LDAP_P((
LDAP_SLAPD_F (int) allComponentsValidate LDAP_P(( LDAP_SLAPD_F (int) allComponentsValidate LDAP_P((
Syntax *syntax, Syntax *syntax,
struct berval* bv )); struct berval* bv ));
#endif #endif
/* /*

3
servers/slapd/schema_prep.c
View file

@ -1029,7 +1029,6 @@ static struct slap_schema_syn_map {
offsetof(struct slap_internal_schema, si_syn_integer) }, offsetof(struct slap_internal_schema, si_syn_integer) },
{ "1.3.6.1.4.1.1466.115.121.1.40", { "1.3.6.1.4.1.1466.115.121.1.40",
offsetof(struct slap_internal_schema, si_syn_octetString) }, offsetof(struct slap_internal_schema, si_syn_octetString) },
{ "1.3.6.1.4.1.1466.115.121.1.3", { "1.3.6.1.4.1.1466.115.121.1.3",
offsetof(struct slap_internal_schema, si_syn_attributeTypeDesc) }, offsetof(struct slap_internal_schema, si_syn_attributeTypeDesc) },
{ "1.3.6.1.4.1.1466.115.121.1.16", { "1.3.6.1.4.1.1466.115.121.1.16",
@ -1044,10 +1043,8 @@ static struct slap_schema_syn_map {
offsetof(struct slap_internal_schema, si_syn_nameFormDesc) }, offsetof(struct slap_internal_schema, si_syn_nameFormDesc) },
{ "1.3.6.1.4.1.1466.115.121.1.37", { "1.3.6.1.4.1.1466.115.121.1.37",
offsetof(struct slap_internal_schema, si_syn_objectClassDesc) }, offsetof(struct slap_internal_schema, si_syn_objectClassDesc) },
{ "1.3.6.1.4.1.1466.115.121.1.17", { "1.3.6.1.4.1.1466.115.121.1.17",
offsetof(struct slap_internal_schema, si_syn_ditStructureRuleDesc) }, offsetof(struct slap_internal_schema, si_syn_ditStructureRuleDesc) },
{ NULL, 0 } { NULL, 0 }
}; };

8
servers/slapd/slap.h
View file

@ -2675,7 +2675,7 @@ typedef int (SLAP_CTRL_PARSE_FN) LDAP_P((
#define LDAP_COMP_FILTER_ITEM ((ber_tag_t) 0xa3U) #define LDAP_COMP_FILTER_ITEM ((ber_tag_t) 0xa3U)
#define LDAP_COMP_FILTER_UNDEFINED ((ber_tag_t) 0xa4U) #define LDAP_COMP_FILTER_UNDEFINED ((ber_tag_t) 0xa4U)
typedef struct slap_component_id{ typedef struct slap_component_id {
int ci_type; int ci_type;
struct slap_component_id *ci_next; struct slap_component_id *ci_next;
@ -2730,10 +2730,12 @@ typedef struct slap_component_assertion_value {
char* cav_ptr; char* cav_ptr;
char* cav_end; char* cav_end;
} ComponentAssertionValue; } ComponentAssertionValue;
/*
#if 0
typedef int encoder_func LDAP_P(( typedef int encoder_func LDAP_P((
void* b, void* b,
void* comp));*/ void* comp));
#endif
struct slap_component_syntax_info; struct slap_component_syntax_info;