2001-07-07 17:13:05 +08:00
|
|
|
/*
|
2002-01-05 05:17:25 +08:00
|
|
|
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
|
2001-07-07 17:13:05 +08:00
|
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* Copyright (c) 1995 Regents of the University of Michigan.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms are permitted
|
|
|
|
* provided that this notice is preserved and that due credit is given
|
|
|
|
* to the University of Michigan at Ann Arbor. The name of the University
|
|
|
|
* may not be used to endorse or promote products derived from this
|
|
|
|
* software without specific prior written permission. This software
|
|
|
|
* is provided ``as is'' without express or implied warranty.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "portable.h"
|
|
|
|
|
|
|
|
#include "slap.h"
|
|
|
|
|
2002-09-03 03:41:03 +08:00
|
|
|
int
|
|
|
|
modify_check_duplicates(
|
|
|
|
AttributeDescription *ad,
|
|
|
|
MatchingRule *mr,
|
|
|
|
BerVarray vals,
|
|
|
|
BerVarray mods,
|
|
|
|
const char **text,
|
|
|
|
char *textbuf, size_t textlen )
|
|
|
|
{
|
2002-09-03 23:12:36 +08:00
|
|
|
int i, j, numvals = 0, nummods,
|
|
|
|
rc = LDAP_SUCCESS;
|
2002-09-03 03:41:03 +08:00
|
|
|
BerVarray nvals = NULL, nmods;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* FIXME: better do the following
|
|
|
|
*
|
|
|
|
* - count the existing values
|
|
|
|
* - count the new values
|
|
|
|
*
|
|
|
|
* - if the existing values are less than the new ones {
|
2002-09-03 23:12:36 +08:00
|
|
|
* - normalize all the existing values
|
2002-09-03 03:41:03 +08:00
|
|
|
* - for each new value {
|
|
|
|
* - normalize
|
|
|
|
* - check with existing
|
|
|
|
* - cross-check with already normalized new vals
|
|
|
|
* }
|
|
|
|
* } else {
|
|
|
|
* - for each new value {
|
|
|
|
* - normalize
|
|
|
|
* - cross-check with already normalized new vals
|
|
|
|
* }
|
|
|
|
* - for each existing value {
|
|
|
|
* - normalize
|
|
|
|
* - check with already normalized new values
|
|
|
|
* }
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* The first case is good when adding a lot of new values,
|
|
|
|
* and significantly at first import of values (e.g. adding
|
|
|
|
* a new group); the latter case seems to be quite important
|
|
|
|
* as well, because it is likely to be the most frequently
|
|
|
|
* used when administering the entry. The current
|
|
|
|
* implementation will always normalize all the existing
|
|
|
|
* values before checking. If there's no duplicate, the
|
|
|
|
* performances should not change; they will in case of error.
|
|
|
|
*/
|
|
|
|
|
2002-09-03 23:12:36 +08:00
|
|
|
for ( nummods = 0; mods[ nummods ].bv_val != NULL; nummods++ )
|
|
|
|
/* count new values */ ;
|
|
|
|
|
2002-09-03 03:41:03 +08:00
|
|
|
if ( vals ) {
|
2002-09-03 23:12:36 +08:00
|
|
|
for ( numvals = 0; vals[ numvals ].bv_val != NULL; numvals++ )
|
2002-09-03 03:41:03 +08:00
|
|
|
/* count existing values */ ;
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
if ( numvals < nummods ) {
|
|
|
|
nvals = ch_calloc( numvals + 1, sizeof( struct berval ) );
|
2002-09-03 03:41:03 +08:00
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
/* normalize the existing values first */
|
|
|
|
for ( j = 0; vals[ j ].bv_val != NULL; j++ ) {
|
|
|
|
rc = value_normalize( ad, SLAP_MR_EQUALITY,
|
|
|
|
&vals[ j ], &nvals[ j ], text );
|
2002-09-03 03:41:03 +08:00
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
/* existing attribute values must normalize */
|
|
|
|
assert( rc == LDAP_SUCCESS );
|
2002-09-03 03:41:03 +08:00
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
nvals[ j ].bv_val = NULL;
|
|
|
|
goto return_results;
|
|
|
|
}
|
2002-09-03 03:41:03 +08:00
|
|
|
}
|
2002-09-08 00:08:30 +08:00
|
|
|
nvals[ j ].bv_val = NULL;
|
2002-09-03 03:41:03 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-03 23:12:36 +08:00
|
|
|
/*
|
|
|
|
* If the existing values are less than the new values,
|
|
|
|
* it is more convenient to normalize all the existing
|
|
|
|
* values and test each new value against them first,
|
|
|
|
* then to other already normalized values
|
|
|
|
*/
|
|
|
|
nmods = ch_calloc( nummods + 1, sizeof( struct berval ) );
|
2002-09-03 03:41:03 +08:00
|
|
|
|
|
|
|
for ( i = 0; mods[ i ].bv_val != NULL; i++ ) {
|
|
|
|
rc = value_normalize( ad, SLAP_MR_EQUALITY,
|
|
|
|
&mods[ i ], &nmods[ i ], text );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
nmods[ i ].bv_val = NULL;
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
|
2002-09-03 23:12:36 +08:00
|
|
|
if ( numvals > 0 && numvals < nummods ) {
|
2002-09-03 03:41:03 +08:00
|
|
|
for ( j = 0; nvals[ j ].bv_val; j++ ) {
|
|
|
|
int match;
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
rc = (*mr->smr_match)( &match,
|
2002-09-03 03:41:03 +08:00
|
|
|
SLAP_MR_VALUE_SYNTAX_MATCH,
|
|
|
|
ad->ad_type->sat_syntax,
|
|
|
|
mr, &nmods[ i ], &nvals[ j ] );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
nmods[ i + 1 ].bv_val = NULL;
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( match == 0 ) {
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"%s: value #%d provided more than once",
|
|
|
|
ad->ad_cname.bv_val, i );
|
|
|
|
rc = LDAP_TYPE_OR_VALUE_EXISTS;
|
|
|
|
nmods[ i + 1 ].bv_val = NULL;
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2002-09-03 23:12:36 +08:00
|
|
|
|
2002-09-03 03:41:03 +08:00
|
|
|
for ( j = 0; j < i; j++ ) {
|
|
|
|
int match;
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
rc = (*mr->smr_match)( &match,
|
2002-09-03 03:41:03 +08:00
|
|
|
SLAP_MR_VALUE_SYNTAX_MATCH,
|
|
|
|
ad->ad_type->sat_syntax,
|
|
|
|
mr, &nmods[ i ], &nmods[ j ] );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
nmods[ i + 1 ].bv_val = NULL;
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( match == 0 ) {
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"%s: value #%d provided more than once",
|
|
|
|
ad->ad_cname.bv_val, j );
|
|
|
|
rc = LDAP_TYPE_OR_VALUE_EXISTS;
|
|
|
|
nmods[ i + 1 ].bv_val = NULL;
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
nmods[ i ].bv_val = NULL;
|
|
|
|
|
2002-09-03 23:12:36 +08:00
|
|
|
/*
|
|
|
|
* if new values are more than existing values, it is more
|
|
|
|
* convenient to normalize and check all new values first,
|
|
|
|
* then check each new value against existing values, which
|
|
|
|
* can be normalized in place
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ( numvals >= nummods ) {
|
|
|
|
for ( j = 0; vals[ j ].bv_val; j++ ) {
|
|
|
|
struct berval asserted;
|
|
|
|
|
|
|
|
rc = value_normalize( ad, SLAP_MR_EQUALITY,
|
|
|
|
&vals[ j ], &asserted, text );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
|
|
|
|
for ( i = 0; nmods[ i ].bv_val; i++ ) {
|
|
|
|
int match;
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
rc = (*mr->smr_match)( &match,
|
2002-09-03 23:12:36 +08:00
|
|
|
SLAP_MR_VALUE_SYNTAX_MATCH,
|
|
|
|
ad->ad_type->sat_syntax,
|
|
|
|
mr, &nmods[ i ], &asserted );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( match == 0 ) {
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"%s: value #%d provided more than once",
|
|
|
|
ad->ad_cname.bv_val, j );
|
|
|
|
rc = LDAP_TYPE_OR_VALUE_EXISTS;
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-03 03:41:03 +08:00
|
|
|
return_results:;
|
|
|
|
if ( nvals ) {
|
|
|
|
ber_bvarray_free( nvals );
|
|
|
|
}
|
|
|
|
if ( nmods ) {
|
|
|
|
ber_bvarray_free( nmods );
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2002-01-20 03:54:48 +08:00
|
|
|
int
|
|
|
|
modify_add_values(
|
|
|
|
Entry *e,
|
|
|
|
Modification *mod,
|
|
|
|
const char **text,
|
|
|
|
char *textbuf, size_t textlen
|
|
|
|
)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
Attribute *a;
|
|
|
|
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
|
|
|
|
const char *op;
|
|
|
|
|
|
|
|
switch( mod->sm_op ) {
|
|
|
|
case LDAP_MOD_ADD:
|
|
|
|
op = "add";
|
|
|
|
break;
|
|
|
|
case LDAP_MOD_REPLACE:
|
|
|
|
op = "replace";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
op = "?";
|
|
|
|
assert( 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
a = attr_find( e->e_attrs, mod->sm_desc );
|
|
|
|
|
|
|
|
/* check if the values we're adding already exist */
|
|
|
|
if( mr == NULL || !mr->smr_match ) {
|
|
|
|
if ( a != NULL ) {
|
|
|
|
/* do not allow add of additional attribute
|
|
|
|
if no equality rule exists */
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/%s: %s: no equality matching rule",
|
|
|
|
op, mod->sm_desc->ad_cname.bv_val );
|
|
|
|
return LDAP_INAPPROPRIATE_MATCHING;
|
|
|
|
}
|
|
|
|
|
|
|
|
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++ ) {
|
2002-09-03 03:41:03 +08:00
|
|
|
if ( bvmatch( &mod->sm_bvalues[i],
|
|
|
|
&a->a_vals[j] ) ) {
|
2002-01-20 03:54:48 +08:00
|
|
|
|
|
|
|
/* value exists already */
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/%s: %s: value #%i already exists",
|
2002-03-24 00:53:44 +08:00
|
|
|
op, mod->sm_desc->ad_cname.bv_val, j );
|
2002-01-20 03:54:48 +08:00
|
|
|
return LDAP_TYPE_OR_VALUE_EXISTS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* test asserted values against themselves */
|
|
|
|
for( j = 0; j < i; j++ ) {
|
2002-09-03 03:41:03 +08:00
|
|
|
if ( bvmatch( &mod->sm_bvalues[i],
|
|
|
|
&mod->sm_bvalues[j] ) ) {
|
2002-01-20 03:54:48 +08:00
|
|
|
|
|
|
|
/* value exists already */
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/%s: %s: value #%i already exists",
|
2002-03-24 00:53:44 +08:00
|
|
|
op, mod->sm_desc->ad_cname.bv_val, j );
|
2002-01-20 03:54:48 +08:00
|
|
|
return LDAP_TYPE_OR_VALUE_EXISTS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
2002-09-03 03:41:03 +08:00
|
|
|
/*
|
|
|
|
* The original code performs ( n ) normalizations
|
|
|
|
* and ( n * ( n - 1 ) / 2 ) matches, which hide
|
|
|
|
* the same number of normalizations. The new code
|
|
|
|
* performs the same number of normalizations ( n )
|
|
|
|
* and ( n * ( n - 1 ) / 2 ) mem compares, far less
|
|
|
|
* expensive than an entire match, if a match is
|
|
|
|
* equivalent to a normalization and a mem compare ...
|
|
|
|
*
|
|
|
|
* This is far more memory expensive than the previous,
|
|
|
|
* but it can heavily improve performances when big
|
|
|
|
* chunks of data are added (typical example is a group
|
|
|
|
* with thousands of DN-syntax members; on my system:
|
|
|
|
* for members of 5-RDN DNs,
|
2002-01-20 03:54:48 +08:00
|
|
|
|
2002-09-03 03:41:03 +08:00
|
|
|
members orig bvmatch (dirty) new
|
|
|
|
1000 0m38.456s 0m0.553s 0m0.608s
|
|
|
|
2000 2m33.341s 0m0.851s 0m1.003s
|
2002-01-20 03:54:48 +08:00
|
|
|
|
2002-09-03 03:41:03 +08:00
|
|
|
* Moreover, 100 groups with 10000 members each were
|
|
|
|
* added in 37m27.933s (an analogous LDIF file was
|
|
|
|
* loaded into Active Directory in 38m28.682s, BTW).
|
|
|
|
*
|
|
|
|
* Maybe we could switch to the new algorithm when
|
|
|
|
* the number of values overcomes a given threshold?
|
|
|
|
*/
|
|
|
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
if ( mod->sm_bvalues[ 1 ].bv_val == 0 ) {
|
|
|
|
if ( a != NULL ) {
|
|
|
|
struct berval asserted;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
|
2002-10-10 07:36:28 +08:00
|
|
|
&mod->sm_bvalues[ 0 ], &asserted, text );
|
2002-09-03 03:41:03 +08:00
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
for ( i = 0; a->a_vals[ i ].bv_val; i++ ) {
|
|
|
|
int match;
|
|
|
|
|
|
|
|
rc = value_match( &match, mod->sm_desc, mr,
|
2002-01-20 03:54:48 +08:00
|
|
|
SLAP_MR_VALUE_SYNTAX_MATCH,
|
2002-10-10 07:36:28 +08:00
|
|
|
&a->a_vals[ i ], &asserted, text );
|
2002-01-20 03:54:48 +08:00
|
|
|
|
|
|
|
if( rc == LDAP_SUCCESS && match == 0 ) {
|
|
|
|
free( asserted.bv_val );
|
|
|
|
return LDAP_TYPE_OR_VALUE_EXISTS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-03 03:41:03 +08:00
|
|
|
} else {
|
|
|
|
rc = modify_check_duplicates( mod->sm_desc, mr,
|
|
|
|
a ? a->a_vals : NULL, mod->sm_bvalues,
|
2002-10-10 07:36:28 +08:00
|
|
|
text, textbuf, textlen );
|
2002-09-03 03:41:03 +08:00
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return rc;
|
2002-01-20 03:54:48 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* no - add them */
|
|
|
|
if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
|
|
|
|
/* this should return result of attr_merge */
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/%s: %s: merge error",
|
|
|
|
op, mod->sm_desc->ad_cname.bv_val );
|
|
|
|
return LDAP_OTHER;
|
|
|
|
}
|
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
modify_delete_values(
|
|
|
|
Entry *e,
|
|
|
|
Modification *mod,
|
|
|
|
const char **text,
|
|
|
|
char *textbuf, size_t textlen
|
|
|
|
)
|
|
|
|
{
|
2002-09-08 00:08:30 +08:00
|
|
|
int i, j, k, rc = LDAP_SUCCESS;
|
2002-01-20 03:54:48 +08:00
|
|
|
Attribute *a;
|
2002-03-24 00:53:44 +08:00
|
|
|
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
|
2002-09-08 00:08:30 +08:00
|
|
|
BerVarray nvals = NULL;
|
|
|
|
char dummy = '\0';
|
2002-01-20 03:54:48 +08:00
|
|
|
|
|
|
|
/* delete the entire attribute */
|
|
|
|
if ( mod->sm_bvalues == NULL ) {
|
2002-09-08 00:08:30 +08:00
|
|
|
rc = attr_delete( &e->e_attrs, mod->sm_desc );
|
2002-01-20 03:54:48 +08:00
|
|
|
|
|
|
|
if( rc != LDAP_SUCCESS ) {
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/delete: %s: no such attribute",
|
|
|
|
mod->sm_desc->ad_cname.bv_val );
|
|
|
|
rc = LDAP_NO_SUCH_ATTRIBUTE;
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( mr == NULL || !mr->smr_match ) {
|
|
|
|
/* disallow specific attributes from being deleted if
|
|
|
|
no equality rule */
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/delete: %s: no equality matching rule",
|
|
|
|
mod->sm_desc->ad_cname.bv_val );
|
|
|
|
return LDAP_INAPPROPRIATE_MATCHING;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* delete specific values - find the attribute first */
|
|
|
|
if ( (a = attr_find( e->e_attrs, mod->sm_desc )) == NULL ) {
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/delete: %s: no such attribute",
|
|
|
|
mod->sm_desc->ad_cname.bv_val );
|
|
|
|
return LDAP_NO_SUCH_ATTRIBUTE;
|
|
|
|
}
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
/* find each value to delete */
|
|
|
|
for ( j = 0; a->a_vals[ j ].bv_val != NULL; j++ )
|
|
|
|
/* count existing values */ ;
|
|
|
|
|
|
|
|
nvals = (BerVarray)ch_calloc( j + 1, sizeof ( struct berval ) );
|
|
|
|
|
|
|
|
/* normalize existing values */
|
|
|
|
for ( j = 0; a->a_vals[ j ].bv_val != NULL; j++ ) {
|
|
|
|
rc = value_normalize( a->a_desc, SLAP_MR_EQUALITY,
|
|
|
|
&a->a_vals[ j ], &nvals[ j ], text );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
nvals[ j ].bv_val = NULL;
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
}
|
2002-01-20 03:54:48 +08:00
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
for ( i = 0; mod->sm_bvalues[ i ].bv_val != NULL; i++ ) {
|
|
|
|
struct berval asserted;
|
|
|
|
int found = 0;
|
2002-01-20 03:54:48 +08:00
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
/* normalize the value to be deleted */
|
|
|
|
rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
|
|
|
|
&mod->sm_bvalues[ i ], &asserted, text );
|
2002-01-20 03:54:48 +08:00
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
if( rc != LDAP_SUCCESS ) {
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* search it */
|
|
|
|
for ( j = 0; nvals[ j ].bv_val != NULL; j++ ) {
|
2002-01-20 03:54:48 +08:00
|
|
|
int match;
|
2002-09-08 00:08:30 +08:00
|
|
|
|
|
|
|
if ( nvals[ j ].bv_val == &dummy ) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = (*mr->smr_match)( &match,
|
2002-01-20 03:54:48 +08:00
|
|
|
SLAP_MR_VALUE_SYNTAX_MATCH,
|
2002-09-08 00:08:30 +08:00
|
|
|
a->a_desc->ad_type->sat_syntax,
|
|
|
|
mr, &nvals[ j ], &asserted );
|
2002-01-20 03:54:48 +08:00
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
free( asserted.bv_val );
|
|
|
|
goto return_results;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( match != 0 ) {
|
2002-01-20 03:54:48 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
found = 1;
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
/* delete value and mark it as dummy */
|
|
|
|
free( nvals[ j ].bv_val );
|
|
|
|
nvals[ j ].bv_val = &dummy;
|
2002-01-20 03:54:48 +08:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
free( asserted.bv_val );
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
if ( found == 0 ) {
|
2002-01-20 03:54:48 +08:00
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/delete: %s: no such value",
|
|
|
|
mod->sm_desc->ad_cname.bv_val );
|
2002-09-08 00:08:30 +08:00
|
|
|
rc = LDAP_NO_SUCH_ATTRIBUTE;
|
|
|
|
goto return_results;
|
2002-01-20 03:54:48 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
/* compact array skipping dummies */
|
|
|
|
for ( k = 0, j = 0; nvals[ k ].bv_val != NULL; j++, k++ ) {
|
|
|
|
|
|
|
|
/* delete and skip dummies */ ;
|
|
|
|
for ( ; nvals[ k ].bv_val == &dummy; k++ ) {
|
|
|
|
free( a->a_vals[ k ].bv_val );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( j != k ) {
|
|
|
|
a->a_vals[ j ] = a->a_vals[ k ];
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( a->a_vals[ k ].bv_val == NULL ) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
a->a_vals[ j ].bv_val = NULL;
|
|
|
|
|
|
|
|
assert( i == k - j );
|
|
|
|
|
2002-01-20 03:54:48 +08:00
|
|
|
/* if no values remain, delete the entire attribute */
|
|
|
|
if ( a->a_vals[0].bv_val == NULL ) {
|
|
|
|
if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
|
|
|
|
*text = textbuf;
|
|
|
|
snprintf( textbuf, textlen,
|
|
|
|
"modify/delete: %s: no such attribute",
|
|
|
|
mod->sm_desc->ad_cname.bv_val );
|
2002-09-08 00:08:30 +08:00
|
|
|
rc = LDAP_NO_SUCH_ATTRIBUTE;
|
2002-01-20 03:54:48 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-08 00:08:30 +08:00
|
|
|
return_results:;
|
|
|
|
if ( nvals ) {
|
|
|
|
/* delete the remaining normalized values */
|
|
|
|
for ( j = 0; nvals[ j ].bv_val != NULL; j++ ) {
|
|
|
|
if ( nvals[ j ].bv_val != &dummy ) {
|
|
|
|
ber_memfree( nvals[ j ].bv_val );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ber_memfree( nvals );
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
2002-01-20 03:54:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
modify_replace_values(
|
|
|
|
Entry *e,
|
|
|
|
Modification *mod,
|
|
|
|
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 LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2001-07-07 17:13:05 +08:00
|
|
|
void
|
|
|
|
slap_mod_free(
|
|
|
|
Modification *mod,
|
|
|
|
int freeit
|
|
|
|
)
|
|
|
|
{
|
2002-01-06 14:11:01 +08:00
|
|
|
#if 0
|
2002-01-02 20:34:35 +08:00
|
|
|
if ( mod->sm_type.bv_val)
|
|
|
|
free( mod->sm_type.bv_val );
|
2002-01-06 14:11:01 +08:00
|
|
|
#endif
|
2001-07-07 17:13:05 +08:00
|
|
|
if ( mod->sm_bvalues != NULL )
|
2002-01-14 09:43:17 +08:00
|
|
|
ber_bvarray_free( mod->sm_bvalues );
|
2001-07-07 17:13:05 +08:00
|
|
|
|
|
|
|
if( freeit )
|
|
|
|
free( mod );
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
slap_mods_free(
|
|
|
|
Modifications *ml
|
|
|
|
)
|
|
|
|
{
|
|
|
|
Modifications *next;
|
|
|
|
|
|
|
|
for ( ; ml != NULL; ml = next ) {
|
|
|
|
next = ml->sml_next;
|
|
|
|
|
|
|
|
slap_mod_free( &ml->sml_mod, 0 );
|
|
|
|
free( ml );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|