X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fad.c;h=0e79845f37ad7fc6787eb2fab0c2916daf188f2b;hb=24db207196a453a4f9acdce08593c7e0ed53ce4c;hp=af487b29f3118b51cbc1fde59c97099e99cd50fc;hpb=f88449bcba767cc3cb4e250be87ea3e800e5c456;p=openldap diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c index af487b29f3..0e79845f37 100644 --- a/servers/slapd/ad.c +++ b/servers/slapd/ad.c @@ -58,7 +58,7 @@ typedef struct Attr_option { int prefix; /* NAME is a tag and range prefix */ } Attr_option; -static Attr_option lang_option = { { sizeof("lang-")-1, "lang-" }, 1 }; +static Attr_option lang_option = { BER_BVC("lang-"), 1 }; /* Options sorted by name, and number of options */ static Attr_option *options = &lang_option; @@ -213,8 +213,8 @@ int slap_bv2ad( *text = "zero length option is invalid"; return rtn; - } else if ( optlen == sizeof("binary")-1 && - strncasecmp( opt, "binary", sizeof("binary")-1 ) == 0 ) + } else if ( optlen == STRLENOF("binary") && + strncasecmp( opt, "binary", STRLENOF("binary") ) == 0 ) { /* binary option */ if( slap_ad_is_binary( &desc ) ) { @@ -356,10 +356,10 @@ done:; if (desc.ad_tags.bv_len || desc.ad_flags != SLAP_DESC_NONE) { dlen = desc.ad_type->sat_cname.bv_len + 1; if (desc.ad_tags.bv_len) { - dlen += 1+desc.ad_tags.bv_len; + dlen += 1 + desc.ad_tags.bv_len; } - if( slap_ad_is_binary( &desc ) ) { - dlen += sizeof(";binary")+desc.ad_tags.bv_len; + if ( slap_ad_is_binary( &desc ) ) { + dlen += 1 + STRLENOF(";binary") + desc.ad_tags.bv_len; } } @@ -384,7 +384,7 @@ done:; lp = NULL; if( desc.ad_tags.bv_len ) { lp = desc.ad_tags.bv_val; - while( strncasecmp(lp, "binary", sizeof("binary")-1) < 0 + while( strncasecmp(lp, "binary", STRLENOF("binary")) < 0 && (lp = strchr( lp, ';' )) != NULL ) ++lp; if( lp != desc.ad_tags.bv_val ) { @@ -963,10 +963,8 @@ str2anlist( AttributeName *an, char *in, const char *brkstr ) return( an ); reterr: - for ( i = 0; an[i].an_name.bv_val; i++ ) { - free( an[i].an_name.bv_val ); - } - free( an ); + anlist_free( an, 1, NULL ); + /* * overwrites input string * on error! @@ -976,6 +974,24 @@ reterr: return NULL; } +void +anlist_free( AttributeName *an, int freename, void *ctx ) +{ + if ( an == NULL ) { + return; + } + + if ( freename ) { + int i; + + for ( i = 0; an[i].an_name.bv_val; i++ ) { + ber_memfree_x( an[i].an_name.bv_val, ctx ); + } + } + + ber_memfree_x( an, ctx ); +} + char **anlist2charray_x( AttributeName *an, int dup, void *ctx ) { char **attrs; @@ -1133,7 +1149,7 @@ file2anlist( AttributeName *an, const char *fname, const char *brkstr ) } an = str2anlist( an, line, brkstr ); if ( an == NULL ) - return NULL; + break; lcur = line; } ch_free( line );