#include "ldap_pvt.h"
#include "slap.h"
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *ad_dup(
AttributeDescription *desc )
{
*ad = *desc;
- ad->ad_cname = ber_bvdup( ad->ad_cname );
- ad->ad_lang = ch_strdup( ad->ad_lang );
+ if( ad->ad_cname != NULL ) {
+ ad->ad_cname = ber_bvdup( ad->ad_cname );
+ }
+
+ if( ad->ad_lang != NULL ) {
+ ad->ad_lang = ch_strdup( ad->ad_lang );
+ }
return ad;
}
{
if( ad == NULL ) return;
- ber_bvfree( ad->ad_cname );
+ if( ad->ad_cname != NULL ) {
+ ber_bvfree( ad->ad_cname );
+ }
+
free( ad->ad_lang );
if( freeit ) free( ad );
int slap_str2ad(
const char *str,
AttributeDescription **ad,
- char **text )
+ const char **text )
{
struct berval bv;
bv.bv_val = (char *) str;
int slap_bv2ad(
struct berval *bv,
AttributeDescription **ad,
- char **text )
+ const char **text )
{
int rtn = LDAP_UNDEFINED_TYPE;
int i;
AttributeDescription desc;
char **tokens;
- assert( *ad != NULL );
- assert( *text != NULL );
+ assert( ad != NULL );
+ assert( *ad == NULL ); /* temporary */
if( bv == NULL || bv->bv_len == 0 ) {
*text = "empty attribute description";
- return LDAP_UNDEFINED_TYPE;
+ return rtn;
}
/* make sure description is IA5 */
if( ad_keystring( bv ) ) {
*text = "attribute description contains inappropriate characters";
- return LDAP_UNDEFINED_TYPE;
+ return rtn;
}
tokens = str2charray( bv->bv_val, ";");
for( i=1; tokens[i] != NULL; i++ ) {
if( strcasecmp( tokens[i], "binary" ) == 0 ) {
- if( desc.ad_flags & SLAP_DESC_BINARY ) {
+ if( slap_ad_is_binary( &desc ) ) {
*text = "option \"binary\" specified multiple times";
goto done;
}
- if(!( desc.ad_type->sat_syntax->ssyn_flags
- & SLAP_SYNTAX_BINARY ))
- {
+ if( !slap_syntax_is_binary( desc.ad_type->sat_syntax )) {
/* not stored in binary, disallow option */
*text = "option \"binary\" with type not supported";
goto done;
*text = "multiple language tag options specified";
goto done;
}
- desc.ad_lang = tokens[i];
+
+ desc.ad_lang = ch_strdup( tokens[i] );
/* normalize to all lower case, it's easy */
ldap_pvt_str2lower( desc.ad_lang );
desc.ad_cname = ch_malloc( sizeof( struct berval ) );
desc.ad_cname->bv_len = strlen( desc.ad_type->sat_cname );
- if( desc.ad_flags & SLAP_DESC_BINARY ) {
+ if( slap_ad_is_binary( &desc ) ) {
desc.ad_cname->bv_len += sizeof("binary");
}
if( desc.ad_lang != NULL ) {
- desc.ad_cname->bv_len += strlen( desc.ad_lang );
+ desc.ad_cname->bv_len += 1 + strlen( desc.ad_lang );
}
- desc.ad_cname = ch_malloc( desc.ad_cname->bv_len + 1 );
+ desc.ad_cname->bv_val = ch_malloc( desc.ad_cname->bv_len + 1 );
strcpy( desc.ad_cname->bv_val, desc.ad_type->sat_cname );
- strcat( desc.ad_cname->bv_val, ";binary" );
- if( desc.ad_flags & SLAP_DESC_BINARY ) {
+ if( slap_ad_is_binary( &desc ) ) {
strcat( desc.ad_cname->bv_val, ";binary" );
}
return 0;
}
- if( super->ad_flags && ( super->ad_flags == sub->ad_flags )) {
+ if( super->ad_flags && ( super->ad_flags != sub->ad_flags )) {
return 0;
}
int i;
for( i=0; attrs[i] != NULL; i++ ) {
AttributeDescription *ad = NULL;
- char *text;
+ const char *text;
int rc;
rc = slap_str2ad( attrs[i], &ad, &text );
return 0;
}
-#endif
+
+int slap_str2undef_ad(
+ const char *str,
+ AttributeDescription **ad,
+ const char **text )
+{
+ struct berval bv;
+ bv.bv_val = (char *) str;
+ bv.bv_len = strlen( str );
+
+ return slap_bv2undef_ad( &bv, ad, text );
+}
+
+int slap_bv2undef_ad(
+ struct berval *bv,
+ AttributeDescription **ad,
+ const char **text )
+{
+ AttributeDescription desc;
+
+ assert( ad != NULL );
+ assert( *ad == NULL ); /* temporary */
+
+ if( bv == NULL || bv->bv_len == 0 ) {
+ *text = "empty attribute description";
+ return LDAP_UNDEFINED_TYPE;
+ }
+
+ /* make sure description is IA5 */
+ if( ad_keystring( bv ) ) {
+ *text = "attribute description contains inappropriate characters";
+ return LDAP_UNDEFINED_TYPE;
+ }
+
+ desc.ad_type = slap_schema.si_at_undefined;
+ desc.ad_flags = SLAP_DESC_NONE;
+ desc.ad_lang = NULL;
+
+ desc.ad_cname = ber_bvdup( bv );
+
+ /* canoncial to upper case */
+ ldap_pvt_str2upper( bv->bv_val );
+
+ if( *ad == NULL ) {
+ *ad = ch_malloc( sizeof( AttributeDescription ) );
+ }
+
+ **ad = desc;
+
+ return LDAP_SUCCESS;
+}