/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
MatchingRule *mr,
BerVarray vals,
BerVarray mods,
+ int permissive,
const char **text,
char *textbuf, size_t textlen )
{
int i, j, numvals = 0, nummods,
- rc = LDAP_SUCCESS;
- BerVarray nvals = NULL, nmods;
+ rc = LDAP_SUCCESS, matched;
+#ifdef SLAP_NVALUES
+ /* needs major reworking */
+#else
+ BerVarray nvals = NULL, nmods = NULL;
/*
* FIXME: better do the following
* then to other already normalized values
*/
nmods = SLAP_CALLOC( nummods + 1, sizeof( struct berval ) );
- if( nmods == NULL ) {
+ if ( nmods == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"modify_check_duplicates: SLAP_CALLOC failed", 0, 0, 0 );
Debug( LDAP_DEBUG_ANY,
"modify_check_duplicates: SLAP_CALLOC failed", 0, 0, 0 );
#endif
- goto return_results;
+ goto return_results;
}
- for ( i = 0; mods[ i ].bv_val != NULL; i++ ) {
+ for ( i=0; mods[i].bv_val != NULL; i++ ) {
rc = value_normalize( ad, SLAP_MR_EQUALITY,
- &mods[ i ], &nmods[ i ], text );
+ &mods[i], &nmods[i], text );
if ( rc != LDAP_SUCCESS ) {
- nmods[ i ].bv_val = NULL;
+ nmods[i].bv_val = NULL;
goto return_results;
}
if ( numvals > 0 && numvals < nummods ) {
- for ( j = 0; nvals[ j ].bv_val; j++ ) {
+ for ( matched=0, j=0; nvals[j].bv_val; j++ ) {
int match;
rc = (*mr->smr_match)( &match,
- SLAP_MR_VALUE_SYNTAX_MATCH,
+ SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
ad->ad_type->sat_syntax,
mr, &nmods[ i ], &nvals[ j ] );
+
if ( rc != LDAP_SUCCESS ) {
nmods[ i + 1 ].bv_val = NULL;
*text = textbuf;
ad->ad_cname.bv_val );
goto return_results;
}
-
+
if ( match == 0 ) {
+ if ( permissive ) {
+ matched++;
+ continue;
+ }
*text = textbuf;
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
goto return_results;
}
}
+
+ if ( permissive && matched == j ) {
+ nmods[ i + 1 ].bv_val = NULL;
+ rc = LDAP_TYPE_OR_VALUE_EXISTS;
+ goto return_results;
+ }
}
- for ( j = 0; j < i; j++ ) {
+ for ( matched = 0, j = 0; j < i; j++ ) {
int match;
rc = (*mr->smr_match)( &match,
- SLAP_MR_VALUE_SYNTAX_MATCH,
+ SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
ad->ad_type->sat_syntax,
mr, &nmods[ i ], &nmods[ j ] );
if ( rc != LDAP_SUCCESS ) {
}
if ( match == 0 ) {
+ if ( permissive ) {
+ matched++;
+ continue;
+ }
*text = textbuf;
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
goto return_results;
}
}
+
+ if ( permissive && matched == j ) {
+ nmods[ i + 1 ].bv_val = NULL;
+ rc = LDAP_TYPE_OR_VALUE_EXISTS;
+ goto return_results;
+ }
}
nmods[ i ].bv_val = NULL;
goto return_results;
}
- for ( i = 0; nmods[ i ].bv_val; i++ ) {
+ for ( matched = 0, i = 0; nmods[ i ].bv_val; i++ ) {
int match;
rc = (*mr->smr_match)( &match,
- SLAP_MR_VALUE_SYNTAX_MATCH,
+ SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
ad->ad_type->sat_syntax,
mr, &nmods[ i ], &asserted );
if ( rc != LDAP_SUCCESS ) {
}
if ( match == 0 ) {
+ if ( permissive ) {
+ matched++;
+ continue;
+ }
*text = textbuf;
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
}
}
+ if ( permissive && matched == i ) {
+ rc = LDAP_TYPE_OR_VALUE_EXISTS;
+ goto return_results;
+ }
}
}
ber_bvarray_free( nmods );
}
+#endif
return rc;
}
modify_add_values(
Entry *e,
Modification *mod,
+ int permissive,
const char **text,
char *textbuf, size_t textlen
)
{
int i, j;
+ int matched;
Attribute *a;
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
const char *op;
a = attr_find( e->e_attrs, mod->sm_desc );
+ /*
+ * With permissive set, as long as the attribute being added
+ * has the same value(s?) as the existing attribute, then the
+ * modify will succeed.
+ */
+
/* check if the values we're adding already exist */
if( mr == NULL || !mr->smr_match ) {
+#ifdef SLAP_NVALUES
+ /* we should have no normalized values as there is no equality rule */
+ /* assert( mod->sm_nvalues[0].bv_val == NULL); */
+#endif
+
if ( a != NULL ) {
/* do not allow add of additional attribute
if no equality rule exists */
for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
/* test asserted values against existing values */
if( a ) {
- for( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
- if ( bvmatch( &mod->sm_bvalues[i],
- &a->a_vals[j] ) ) {
-
+#ifdef SLAP_NVALUES
+ /* we should have no normalized values as there
+ is no equality rule */
+ assert( a->a_nvals == NULL);
+#endif
+ for( matched = 0, j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+ if ( bvmatch( &mod->sm_bvalues[i], &a->a_vals[j] ) ) {
+ if ( permissive ) {
+ matched++;
+ continue;
+ }
/* value exists already */
*text = textbuf;
snprintf( textbuf, textlen,
return LDAP_TYPE_OR_VALUE_EXISTS;
}
}
+ if ( permissive && matched == j ) {
+ /* values already exist; do nothing */
+ return LDAP_SUCCESS;
+ }
}
/* test asserted values against themselves */
}
} else {
+#ifdef SLAP_NVALUES
+ /* no normalization is done in this routine nor
+ * in the matching routines called by this routine.
+ * values are now normalized once on input to the
+ * server (whether from LDAP or from the underlying
+ * database).
+ * This should outperform the old code. No numbers
+ * are available yet.
+ */
+#else
/*
* The original code performs ( n ) normalizations
* and ( n * ( n - 1 ) / 2 ) matches, which hide
* Maybe we could switch to the new algorithm when
* the number of values overcomes a given threshold?
*/
+#endif
int rc;
- if ( mod->sm_bvalues[ 1 ].bv_val == 0 ) {
+ if ( mod->sm_bvalues[1].bv_val == 0 ) {
if ( a != NULL ) {
struct berval asserted;
int i;
+#ifndef SLAP_NVALUES
rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
&mod->sm_bvalues[ 0 ], &asserted, text );
-
if ( rc != LDAP_SUCCESS ) {
return rc;
}
+#endif
- for ( i = 0; a->a_vals[ i ].bv_val; i++ ) {
+ for ( matched = 0, i = 0; a->a_vals[ i ].bv_val; i++ ) {
int match;
+#ifdef SLAP_NVALUES
+ if( mod->sm_nvalues ) {
+ rc = value_match( &match, mod->sm_desc, mr,
+ SLAP_MR_EQUALITY
+ | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
+ | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
+ | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+ &a->a_nvals[i],
+ &mod->sm_nvalues[0],
+ text );
+
+ } else {
+ rc = value_match( &match, mod->sm_desc, mr,
+ SLAP_MR_EQUALITY
+ | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ &a->a_vals[i],
+ &mod->sm_values[0],
+ text );
+ }
+
+#else
rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_VALUE_SYNTAX_MATCH,
- &a->a_vals[ i ], &asserted, text );
+ SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
+ &a->a_vals[i],
+ &asserted,
+ text );
+#endif
if( rc == LDAP_SUCCESS && match == 0 ) {
+ if ( permissive ) {
+ matched++;
+ continue;
+ }
free( asserted.bv_val );
*text = textbuf;
snprintf( textbuf, textlen,
return LDAP_TYPE_OR_VALUE_EXISTS;
}
}
+ if ( permissive && matched == i ) {
+ /* values already exist; do nothing */
+ return LDAP_SUCCESS;
+ }
}
} else {
rc = modify_check_duplicates( mod->sm_desc, mr,
a ? a->a_vals : NULL, mod->sm_bvalues,
+ permissive,
text, textbuf, textlen );
-
+
+ if ( permissive && rc == LDAP_TYPE_OR_VALUE_EXISTS ) {
+ return LDAP_SUCCESS;
+ }
+
if ( rc != LDAP_SUCCESS ) {
return rc;
}
}
/* no - add them */
- if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
+#ifdef SLAP_NVALUES
+ if( attr_merge( e, mod->sm_desc, mod->sm_values, mod->sm_nvalues ) != 0 )
+#else
+ if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
+#endif
+ {
/* this should return result of attr_merge */
*text = textbuf;
snprintf( textbuf, textlen,
modify_delete_values(
Entry *e,
Modification *mod,
+ int permissive,
const char **text,
char *textbuf, size_t textlen
)
int i, j, k, rc = LDAP_SUCCESS;
Attribute *a;
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
+#ifndef SLAP_NVALUES
BerVarray nvals = NULL;
+#endif
char dummy = '\0';
+ /*
+ * If permissive is set, then the non-existence of an
+ * attribute is not treated as an error.
+ */
+
/* delete the entire attribute */
if ( mod->sm_bvalues == NULL ) {
rc = attr_delete( &e->e_attrs, mod->sm_desc );
- if( rc != LDAP_SUCCESS ) {
+ if( permissive ) {
+ rc = LDAP_SUCCESS;
+ } else if( rc != LDAP_SUCCESS ) {
*text = textbuf;
snprintf( textbuf, textlen,
"modify/delete: %s: no such attribute",
/* delete specific values - find the attribute first */
if ( (a = attr_find( e->e_attrs, mod->sm_desc )) == NULL ) {
+ if( permissive ) {
+ return LDAP_SUCCESS;
+ }
*text = textbuf;
snprintf( textbuf, textlen,
"modify/delete: %s: no such attribute",
return LDAP_NO_SUCH_ATTRIBUTE;
}
+#ifndef SLAP_NVALUES
/* find each value to delete */
for ( j = 0; a->a_vals[ j ].bv_val != NULL; j++ )
/* count existing values */ ;
goto return_results;
}
}
+#endif
- for ( i = 0; mod->sm_bvalues[ i ].bv_val != NULL; i++ ) {
- struct berval asserted;
+ for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
int found = 0;
+#ifndef SLAP_NVALUES
+ struct berval asserted;
/* normalize the value to be deleted */
rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
}
/* search it */
- for ( j = 0; nvals[ j ].bv_val != NULL; j++ ) {
+ for ( j = 0; nvals[ j ].bv_val != NULL; j++ )
+#else
+ for ( j = 0; a->a_vals[j].bv_val != NULL; j++ )
+#endif
+ {
int match;
- if ( nvals[ j ].bv_val == &dummy ) {
+#ifndef SLAP_NVALUES
+ if ( nvals[j].bv_val == &dummy ) {
continue;
}
+#endif
+#ifdef SLAP_NVALUES
+ if( mod->sm_nvalues ) {
+ assert( a->a_nvals );
+ rc = (*mr->smr_match)( &match,
+ SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
+ | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
+ | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+ a->a_desc->ad_type->sat_syntax,
+ mr, &a->a_nvals[j],
+ &mod->sm_nvalues[i] );
+ } else {
+ assert( a->a_nvals == NULL );
+ rc = (*mr->smr_match)( &match,
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ a->a_desc->ad_type->sat_syntax,
+ mr, &a->a_nvals[j],
+ &mod->sm_values[i] );
+ }
+#else
rc = (*mr->smr_match)( &match,
- SLAP_MR_VALUE_SYNTAX_MATCH,
+ SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
a->a_desc->ad_type->sat_syntax,
- mr, &nvals[ j ], &asserted );
+ mr, &nvals[ j ],
+ &asserted );
+#endif
if ( rc != LDAP_SUCCESS ) {
+#ifndef SLAP_NVALUES
free( asserted.bv_val );
+#endif
*text = textbuf;
snprintf( textbuf, textlen,
"%s: matching rule failed",
found = 1;
/* delete value and mark it as dummy */
+#ifdef SLAP_NVALUES
+ free( a->a_vals[j].bv_val );
+ a->a_vals[j].bv_val = &dummy;
+ if( a->a_nvals ) {
+ free( a->a_nvals[j].bv_val );
+ a->a_nvals[j].bv_val = &dummy;
+ }
+#else
free( nvals[ j ].bv_val );
nvals[ j ].bv_val = &dummy;
+#endif
break;
}
+#ifndef SLAP_NVALUES
free( asserted.bv_val );
+#endif
if ( found == 0 ) {
*text = textbuf;
}
/* compact array skipping dummies */
- for ( k = 0, j = 0; nvals[ k ].bv_val != NULL; j++, k++ ) {
-
+#ifdef SLAP_NVALUES
+ for ( k = 0, j = 0; a->a_vals[k].bv_val != NULL; k++ )
+#else
+ for ( k = 0, j = 0; nvals[k].bv_val != NULL; j++, k++ )
+#endif
+ {
+#ifdef SLAP_NVALUES
+ /* skip dummies */
+ if( a->a_vals[k].bv_val == &dummy ) {
+ assert( a->a_nvals == NULL || a->a_nvals[k].bv_val == &dummy );
+ continue;
+ }
+#else
/* delete and skip dummies */ ;
for ( ; nvals[ k ].bv_val == &dummy; k++ ) {
free( a->a_vals[ k ].bv_val );
}
-
+#endif
if ( j != k ) {
a->a_vals[ j ] = a->a_vals[ k ];
+#ifdef SLAP_NVALUES
+ if (a->a_nvals) {
+ a->a_nvals[ j ] = a->a_nvals[ k ];
+ }
+#endif
}
+#ifndef SLAP_NVALUES
if ( a->a_vals[ k ].bv_val == NULL ) {
break;
}
+#else
+ j++;
+#endif
}
- a->a_vals[ j ].bv_val = NULL;
+
+ a->a_vals[j].bv_val = NULL;
+#ifdef SLAP_NVALUES
+ if (a->a_nvals) a->a_nvals[j].bv_val = NULL;
+#else
assert( i == k - j );
+#endif
/* if no values remain, delete the entire attribute */
if ( a->a_vals[0].bv_val == NULL ) {
}
return_results:;
+#ifndef SLAP_NVALUES
if ( nvals ) {
/* delete the remaining normalized values */
for ( j = 0; nvals[ j ].bv_val != NULL; j++ ) {
}
ber_memfree( nvals );
}
+#endif
return rc;
}
modify_replace_values(
Entry *e,
Modification *mod,
+ int permissive,
const char **text,
char *textbuf, size_t textlen
)
(void) attr_delete( &e->e_attrs, mod->sm_desc );
if ( mod->sm_bvalues ) {
- return modify_add_values( e, mod, text, textbuf, textlen );
+ return modify_add_values( e, mod, permissive, text, textbuf, textlen );
}
return LDAP_SUCCESS;
int freeit
)
{
-#if 0
- if ( mod->sm_type.bv_val)
- free( mod->sm_type.bv_val );
+ if ( mod->sm_values != NULL ) ber_bvarray_free( mod->sm_values );
+ mod->sm_values = NULL;
+
+#ifdef SLAP_NVALUES
+ if ( mod->sm_nvalues != NULL ) ber_bvarray_free( mod->sm_nvalues );
+ mod->sm_nvalues = NULL;
#endif
- if ( mod->sm_bvalues != NULL )
- ber_bvarray_free( mod->sm_bvalues );
- if( freeit )
- free( mod );
+ if( freeit ) free( mod );
}
void
projects / openldap / blobdiff