From: Kurt Zeilenga Date: Tue, 7 Dec 2004 18:40:47 +0000 (+0000) Subject: cleanup X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~103 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d616bd4ff834e72e9fb7accf98b492d45c0aba5c;p=openldap cleanup --- diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c index e89772e985..5d238d0328 100644 --- a/servers/slapd/entry.c +++ b/servers/slapd/entry.c @@ -93,8 +93,8 @@ str2entry( char *s ) if( e == NULL ) { Debug( LDAP_DEBUG_ANY, - "<= str2entry NULL (entry allocation failed)\n", - 0, 0, 0 ); + "<= str2entry NULL (entry allocation failed)\n", + 0, 0, 0 ); return( NULL ); } @@ -116,7 +116,7 @@ str2entry( char *s ) if ( ldif_parse_line( s, &type, &vals[0].bv_val, &vals[0].bv_len ) != 0 ) { Debug( LDAP_DEBUG_TRACE, - "<= str2entry NULL (parse_line)\n", 0, 0, 0 ); + "<= str2entry NULL (parse_line)\n", 0, 0, 0 ); continue; } @@ -126,7 +126,7 @@ str2entry( char *s ) if ( e->e_dn != NULL ) { Debug( LDAP_DEBUG_ANY, "str2entry: " "entry %ld has multiple DNs \"%s\" and \"%s\"\n", - (long) e->e_id, e->e_dn, vals[0].bv_val ); + (long) e->e_id, e->e_dn, vals[0].bv_val ); free( vals[0].bv_val ); entry_free( e ); return NULL; @@ -254,7 +254,7 @@ str2entry( char *s ) rc = attr_merge( e, ad, vals, nvalsp ); if( rc != 0 ) { Debug( LDAP_DEBUG_ANY, - "<= str2entry NULL (attr_merge)\n", 0, 0, 0 ); + "<= str2entry NULL (attr_merge)\n", 0, 0, 0 ); entry_free( e ); free( vals[0].bv_val ); free( type ); @@ -271,7 +271,7 @@ str2entry( char *s ) /* check to make sure there was a dn: line */ if ( e->e_dn == NULL ) { Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n", - (long) e->e_id, 0, 0 ); + (long) e->e_id, 0, 0 ); entry_free( e ); return NULL; } @@ -289,7 +289,7 @@ str2entry( char *s ) ptrdiff_t offset; \ offset = (int) (ecur - ebuf); \ ebuf = (unsigned char *) ch_realloc( (char *) ebuf, \ - emaxsize + GRABSIZE ); \ + emaxsize + GRABSIZE ); \ emaxsize += GRABSIZE; \ ecur = ebuf + offset; \ } \ @@ -297,8 +297,8 @@ str2entry( char *s ) char * entry2str( - Entry *e, - int *len ) + Entry *e, + int *len ) { Attribute *a; struct berval *bv; @@ -332,7 +332,7 @@ entry2str( MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len )); ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, a->a_desc->ad_cname.bv_val, - bv->bv_val, bv->bv_len ); + bv->bv_val, bv->bv_len ); } } MAKE_SPACE( 1 ); @@ -558,27 +558,27 @@ int entry_encode(Entry *e, struct berval *bv) ptr += a->a_desc->ad_cname.bv_len; *ptr++ = '\0'; if (a->a_vals) { - for (i=0; a->a_vals[i].bv_val; i++); - entry_putlen(&ptr, i); - for (i=0; a->a_vals[i].bv_val; i++) { + for (i=0; a->a_vals[i].bv_val; i++); + entry_putlen(&ptr, i); + for (i=0; a->a_vals[i].bv_val; i++) { entry_putlen(&ptr, a->a_vals[i].bv_len); AC_MEMCPY(ptr, a->a_vals[i].bv_val, a->a_vals[i].bv_len); ptr += a->a_vals[i].bv_len; *ptr++ = '\0'; - } - if (a->a_nvals != a->a_vals) { - entry_putlen(&ptr, i); + } + if (a->a_nvals != a->a_vals) { + entry_putlen(&ptr, i); for (i=0; a->a_nvals[i].bv_val; i++) { - entry_putlen(&ptr, a->a_nvals[i].bv_len); - AC_MEMCPY(ptr, a->a_nvals[i].bv_val, + entry_putlen(&ptr, a->a_nvals[i].bv_len); + AC_MEMCPY(ptr, a->a_nvals[i].bv_val, a->a_nvals[i].bv_len); - ptr += a->a_nvals[i].bv_len; - *ptr++ = '\0'; + ptr += a->a_nvals[i].bv_len; + *ptr++ = '\0'; + } + } else { + entry_putlen(&ptr, 0); } - } else { - entry_putlen(&ptr, 0); - } } } *ptr = '\0'; @@ -623,8 +623,8 @@ int entry_decode(struct berval *bv, Entry **e) x->e_nname.bv_len = i; ptr += i+1; Debug( LDAP_DEBUG_TRACE, - "entry_decode: \"%s\"\n", - x->e_dn, 0, 0 ); + "entry_decode: \"%s\"\n", + x->e_dn, 0, 0 ); x->e_bv = *bv; /* A valid entry must have at least one attr, so this diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c index fc090eb3fc..ec4ce226b6 100644 --- a/servers/slapd/filterentry.c +++ b/servers/slapd/filterentry.c @@ -208,18 +208,19 @@ static int test_mra_filter( const char *text; #ifdef LDAP_COMP_MATCH - /* Component Matching */ - if( mra->ma_cf && mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) { - rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, - (struct berval *)a,(void*) mra , &text ); - } - else { -#endif - rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, - bv, &mra->ma_value, &text ); -#ifdef LDAP_COMP_MATCH - } + /* Component Matching */ + if( mra->ma_cf && + mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) + { + rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, + (struct berval *)a,(void*) mra , &text ); + } else #endif + { + rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, + bv, &mra->ma_value, &text ); + } + if( rc != LDAP_SUCCESS ) return rc; if ( ret == 0 ) return LDAP_COMPARE_TRUE; } @@ -263,20 +264,19 @@ static int test_mra_filter( int ret; #ifdef LDAP_COMP_MATCH - /* Component Matching */ - if( mra->ma_cf && - mra->ma_rule->smr_usage & SLAP_MR_COMPONENT) { - rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, - (struct berval*)a, (void*)mra, &text ); - } - else { -#endif - rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, - bv, &value, &text ); - -#ifdef LDAP_COMP_MATCH - } + /* Component Matching */ + if( mra->ma_cf && + mra->ma_rule->smr_usage & SLAP_MR_COMPONENT) + { + rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, + (struct berval*)a, (void*)mra, &text ); + } else #endif + { + rc = value_match( &ret, a->a_desc, mra->ma_rule, 0, + bv, &value, &text ); + } + if( rc != LDAP_SUCCESS ) break; if ( ret == 0 ) { diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c index 097f34b25c..688786e313 100644 --- a/servers/slapd/mra.c +++ b/servers/slapd/mra.c @@ -31,8 +31,9 @@ mra_free( { #ifdef LDAP_COMP_MATCH /* 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 ); + } #endif /* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */ ch_free( mra->ma_value.bv_val ); diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 219c4f1011..d1daf2c923 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -375,7 +375,6 @@ LDAP_SLAPD_F (int) componentFilterValidate LDAP_P(( LDAP_SLAPD_F (int) allComponentsValidate LDAP_P(( Syntax *syntax, struct berval* bv )); - #endif /* diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 6421cacf77..6cbf98af2e 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -3078,8 +3078,8 @@ static slap_syntax_defs_rec syntax_defs[] = { {"( 1.2.36.79672281.1.5.0 DESC 'RDN' )", 0, rdnValidate, rdnPretty}, #ifdef LDAP_COMP_MATCH - {"( 1.2.36.79672281.1.5.3 DESC 'allComponents' )", - 0, allComponentsValidate, NULL}, + {"( 1.2.36.79672281.1.5.3 DESC 'allComponents' )", + 0, allComponentsValidate, NULL}, {"( 1.2.36.79672281.1.5.2 DESC 'componentFilterMatch assertion') ", 0, componentFilterValidate, NULL}, #endif diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c index ac9805c67b..948e8d1486 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -1029,7 +1029,6 @@ static struct slap_schema_syn_map { offsetof(struct slap_internal_schema, si_syn_integer) }, { "1.3.6.1.4.1.1466.115.121.1.40", offsetof(struct slap_internal_schema, si_syn_octetString) }, - { "1.3.6.1.4.1.1466.115.121.1.3", offsetof(struct slap_internal_schema, si_syn_attributeTypeDesc) }, { "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) }, { "1.3.6.1.4.1.1466.115.121.1.37", offsetof(struct slap_internal_schema, si_syn_objectClassDesc) }, - { "1.3.6.1.4.1.1466.115.121.1.17", offsetof(struct slap_internal_schema, si_syn_ditStructureRuleDesc) }, - { NULL, 0 } }; diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 22dc51eb67..09a1851ee6 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -476,7 +476,7 @@ typedef struct slap_matching_rule { #define SLAP_MR_ORDERING 0x0200U #define SLAP_MR_SUBSTR 0x0400U #define SLAP_MR_EXT 0x0800U /* implicitly extensible */ -#define SLAP_MR_ORDERED_INDEX 0x1000U +#define SLAP_MR_ORDERED_INDEX 0x1000U #ifdef LDAP_COMP_MATCH #define SLAP_MR_COMPONENT 0x2000U #endif @@ -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_UNDEFINED ((ber_tag_t) 0xa4U) -typedef struct slap_component_id{ +typedef struct slap_component_id { int ci_type; struct slap_component_id *ci_next; @@ -2730,10 +2730,12 @@ typedef struct slap_component_assertion_value { char* cav_ptr; char* cav_end; } ComponentAssertionValue; -/* + +#if 0 typedef int encoder_func LDAP_P(( void* b, - void* comp));*/ + void* comp)); +#endif struct slap_component_syntax_info;