/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
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;
}
static char *strchrlen(
- const char *p,
+ const char *beg,
+ const char *end,
const char ch,
int *len )
{
- int i;
+ const char *p;
- for( i=0; p[i]; i++ ) {
- if( p[i] == ch ) {
- *len = i;
- return (char *) &p[i];
+ for( p=beg; *p && p < end; p++ ) {
+ if( *p == ch ) {
+ *len = p - beg;
+ return (char *) p;
}
}
- *len = i;
+ *len = p - beg;
return NULL;
}
{
int rtn = LDAP_UNDEFINED_TYPE;
AttributeDescription desc, *d2;
- char *name, *options;
+ char *name, *options, *optn;
char *opt, *next;
int ntags;
int tagslen;
}
/* find valid base attribute type; parse in place */
- memset( &desc, 0, sizeof( desc ) );
desc.ad_cname = *bv;
+ desc.ad_flags = 0;
+ BER_BVZERO( &desc.ad_tags );
name = bv->bv_val;
- options = strchr( name, ';' );
+ options = ber_bvchr( bv, ';' );
if ( options != NULL && (unsigned) ( options - name ) < bv->bv_len ) {
/* don't go past the end of the berval! */
desc.ad_cname.bv_len = options - name;
* parse options in place
*/
ntags = 0;
- memset( tags, 0, sizeof( tags ));
tagslen = 0;
+ optn = bv->bv_val + bv->bv_len;
for( opt=options; opt != NULL; opt=next ) {
int optlen;
opt++;
- next = strchrlen( opt, ';', &optlen );
+ next = strchrlen( opt, optn, ';', &optlen );
if( optlen == 0 ) {
*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 ) ) {
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;
}
}
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 ) {
struct berval *subtagsbv,
struct berval *suptagsbv )
{
- const char *suptags, *supp, *supdelimp;
- const char *subtags, *subp, *subdelimp;
+ const char *suptags, *supp, *supdelimp, *supn;
+ const char *subtags, *subp, *subdelimp, *subn;
int suplen, sublen;
subtags =subtagsbv->bv_val;
suptags =suptagsbv->bv_val;
+ subn = subtags + subtagsbv->bv_len;
+ supn = suptags + suptagsbv->bv_len;
for( supp=suptags ; supp; supp=supdelimp ) {
- supdelimp = strchrlen( supp, ';', &suplen );
+ supdelimp = strchrlen( supp, supn, ';', &suplen );
if( supdelimp ) supdelimp++;
for( subp=subtags ; subp; subp=subdelimp ) {
- subdelimp = strchrlen( subp, ';', &sublen );
+ subdelimp = strchrlen( subp, subn, ';', &sublen );
if( subdelimp ) subdelimp++;
if ( suplen > sublen
return LDAP_SUCCESS;
}
+AttributeDescription *
+slap_bv2tmp_ad(
+ struct berval *bv,
+ void *memctx )
+{
+ AttributeDescription *ad =
+ slap_sl_mfuncs.bmf_malloc( sizeof(AttributeDescription) +
+ bv->bv_len + 1, memctx );
+
+ ad->ad_cname.bv_val = (char *)(ad+1);
+ strncpy( ad->ad_cname.bv_val, bv->bv_val, bv->bv_len+1 );
+ ad->ad_cname.bv_len = bv->bv_len;
+ ad->ad_flags = SLAP_DESC_TEMPORARY;
+ ad->ad_type = slap_schema.si_at_undefined;
+
+ return ad;
+}
+
static int
-undef_remove(
+undef_promote(
AttributeType *at,
- char *name )
+ char *name,
+ AttributeType *nat )
{
- AttributeDescription **u_ad;
+ AttributeDescription **u_ad, **n_ad;
+
+ /* Get to last ad on the new type */
+ for ( n_ad = &nat->sat_ad; *n_ad; n_ad = &(*n_ad)->ad_next ) ;
for ( u_ad = &at->sat_ad; *u_ad; ) {
struct berval bv;
*u_ad = (*u_ad)->ad_next;
- ch_free( tmp );
-
+ tmp->ad_next = NULL;
+ *n_ad = tmp;
+ n_ad = &tmp->ad_next;
} else {
u_ad = &(*u_ad)->ad_next;
}
}
int
-slap_ad_undef_remove(
- char *name )
+slap_ad_undef_promote(
+ char *name,
+ AttributeType *at )
{
int rc;
ldap_pvt_thread_mutex_lock( &ad_undef_mutex );
- rc = undef_remove( slap_schema.si_at_undefined, name );
+ rc = undef_promote( slap_schema.si_at_undefined, name, at );
if ( rc == 0 ) {
- rc = undef_remove( slap_schema.si_at_proxied, name );
+ rc = undef_promote( slap_schema.si_at_proxied, name, at );
}
ldap_pvt_thread_mutex_unlock( &ad_undef_mutex );
}
an = ch_realloc( an, ( i + j + 1 ) * sizeof( AttributeName ) );
- BER_BVZERO( &an[i + j].an_name );
anew = an + i;
for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
s != NULL;
s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
{
+ /* put a stop mark */
+ BER_BVZERO( &anew[1].an_name );
+
anew->an_desc = NULL;
anew->an_oc = NULL;
anew->an_oc_exclude = 0;
char **attrs;
ObjectClass *oc;
- attrs = anlist2charray( anlist, 1 );
-
+ if ( anlist == NULL )
+ return NULL;
+
for ( i = 0; anlist[i].an_name.bv_val; i++ ) {
if ( ( oc = anlist[i].an_oc ) ) {
for ( j = 0; oc->soc_required && oc->soc_required[j]; j++ ) ;
if ( i == 0 )
return NULL;
+ attrs = anlist2charray( anlist, 1 );
+
n = i;
if ( k )
i = 0;
while ( attrs && attrs[i] ) {
if ( *attrs[i] == '@' ) {
+ ch_free( attrs[i] );
for ( j = i; attrs[j]; j++ ) {
- if ( j == i )
- ch_free( attrs[i] );
attrs[j] = attrs[j+1];
}
} else {
j = i + 1;
while ( attrs && attrs[j] ) {
if ( !strcmp( attrs[i], attrs[j] )) {
+ ch_free( attrs[j] );
for ( k = j; attrs && attrs[k]; k++ ) {
- if ( k == j )
- ch_free( attrs[j] );
attrs[k] = attrs[k+1];
}
} else {
}
an = str2anlist( an, line, brkstr );
if ( an == NULL )
- return NULL;
+ break;
lcur = line;
}
ch_free( line );
return 0;
}
+void
+ad_unparse_options( BerVarray *res )
+{
+ int i;
+ for ( i = 0; i < option_count; i++ ) {
+ value_add_one( res, &options[i].name );
+ }
+}
+
/* Find the definition of the option name or prefix matching the arguments */
static Attr_option *
ad_find_option_definition( const char *opt, int optlen )
projects / openldap / blobdiff