X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmods.c;h=918a25a4ffb59c38200858c45e8b4ffbb2031c75;hb=93d0ef91e65c6d11991b1c36faba67f212f43a34;hp=bda5738a47c774f5dbb8f7ff173b0bc72eacb185;hpb=7760b20f7fda4603b6d37a29fd9e426505a21a1c;p=openldap
diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index bda5738a47..918a25a4ff 100644
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,7 @@
#include
#include "slap.h"
+#include "lutil.h"
int
modify_add_values(
@@ -73,11 +74,15 @@ modify_add_values(
}
if ( permissive ) {
- for ( i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) /* count 'em */;
- pmod.sm_values = (BerVarray)ch_malloc( (i + 1)*sizeof( struct berval ) );
+ for ( i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) {
+ /* EMPTY -- just counting 'em */;
+ }
+
+ pmod.sm_values = (BerVarray)ch_malloc(
+ (i + 1) * sizeof( struct berval ));
if ( pmod.sm_nvalues != NULL ) {
pmod.sm_nvalues = (BerVarray)ch_malloc(
- (i + 1)*sizeof( struct berval ) );
+ (i + 1) * sizeof( struct berval ));
}
}
@@ -90,17 +95,17 @@ modify_add_values(
for ( p = i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) {
int match;
- assert( a->a_vals[0].bv_val );
+ assert( a->a_vals[0].bv_val != NULL );
for ( j = 0; !BER_BVISNULL( &a->a_vals[j] ); j++ ) {
if ( mod->sm_nvalues ) {
- rc = value_match( &match, mod->sm_desc, mr,
+ rc = ordered_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[j], &mod->sm_nvalues[i], text );
} else {
- rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ rc = ordered_value_match( &match, mod->sm_desc, mr,
+ SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
&a->a_vals[j], &mod->sm_values[i], text );
}
@@ -143,7 +148,12 @@ modify_add_values(
}
/* no - add them */
- rc = attr_merge( e, mod->sm_desc, pmod.sm_values, pmod.sm_nvalues );
+ if ( mod->sm_desc->ad_type->sat_flags & SLAP_AT_ORDERED_VAL ) {
+ rc = ordered_value_add( e, mod->sm_desc, a,
+ pmod.sm_values, pmod.sm_nvalues );
+ } else {
+ rc = attr_merge( e, mod->sm_desc, pmod.sm_values, pmod.sm_nvalues );
+ }
if ( a != NULL && permissive ) {
ch_free( pmod.sm_values );
@@ -164,17 +174,29 @@ modify_add_values(
int
modify_delete_values(
+ Entry *e,
+ Modification *m,
+ int perm,
+ const char **text,
+ char *textbuf, size_t textlen )
+{
+ return modify_delete_vindex( e, m, perm, text, textbuf, textlen, NULL );
+}
+
+int
+modify_delete_vindex(
Entry *e,
Modification *mod,
int permissive,
const char **text,
- char *textbuf, size_t textlen )
+ char *textbuf, size_t textlen,
+ int *idx )
{
int i, j, k, rc = LDAP_SUCCESS;
Attribute *a;
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
char dummy = '\0';
- int match = 0;
+ int match = 0;
/*
* If permissive is set, then the non-existence of an
@@ -219,28 +241,28 @@ modify_delete_values(
return LDAP_NO_SUCH_ATTRIBUTE;
}
- for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
+ for ( i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) {
int found = 0;
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+ for ( j = 0; !BER_BVISNULL( &a->a_vals[j] ); j++ ) {
+ /* skip already deleted values */
+ if ( a->a_vals[j].bv_val == &dummy ) {
+ continue;
+ }
if( mod->sm_nvalues ) {
- assert( a->a_nvals );
- rc = (*mr->smr_match)( &match,
- SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
+ assert( a->a_nvals != NULL );
+ rc = ordered_value_match( &match, a->a_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_desc->ad_type->sat_syntax,
- mr, &a->a_nvals[j],
- &mod->sm_nvalues[i] );
+ &a->a_nvals[j], &mod->sm_nvalues[i], text );
} else {
#if 0
assert( a->a_nvals == NULL );
#endif
- rc = (*mr->smr_match)( &match,
- SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
- a->a_desc->ad_type->sat_syntax,
- mr, &a->a_vals[j],
- &mod->sm_values[i] );
+ rc = ordered_value_match( &match, a->a_desc, mr,
+ SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+ &a->a_vals[j], &mod->sm_values[i], text );
}
if ( rc != LDAP_SUCCESS ) {
@@ -257,6 +279,9 @@ modify_delete_values(
found = 1;
+ if ( idx )
+ idx[i] = j;
+
/* delete value and mark it as dummy */
free( a->a_vals[j].bv_val );
a->a_vals[j].bv_val = &dummy;
@@ -283,10 +308,10 @@ modify_delete_values(
}
/* compact array skipping dummies */
- for ( k = 0, j = 0; a->a_vals[k].bv_val != NULL; k++ ) {
+ for ( k = 0, j = 0; !BER_BVISNULL( &a->a_vals[k] ); k++ ) {
/* skip dummies */
if( a->a_vals[k].bv_val == &dummy ) {
- assert( a->a_nvals == NULL || a->a_nvals[k].bv_val == &dummy );
+ assert( a->a_nvals[k].bv_val == &dummy );
continue;
}
if ( j != k ) {
@@ -299,11 +324,13 @@ modify_delete_values(
j++;
}
- a->a_vals[j].bv_val = NULL;
- if (a->a_nvals != a->a_vals) a->a_nvals[j].bv_val = NULL;
+ BER_BVZERO( &a->a_vals[j] );
+ if (a->a_nvals != a->a_vals) {
+ BER_BVZERO( &a->a_nvals[j] );
+ }
/* if no values remain, delete the entire attribute */
- if ( a->a_vals[0].bv_val == NULL ) {
+ if ( BER_BVISNULL( &a->a_vals[0] ) ) {
if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
*text = textbuf;
snprintf( textbuf, textlen,
@@ -311,6 +338,9 @@ modify_delete_values(
mod->sm_desc->ad_cname.bv_val );
rc = LDAP_NO_SUCH_ATTRIBUTE;
}
+ } else if ( a->a_desc->ad_type->sat_flags & SLAP_AT_ORDERED_VAL ) {
+ /* For an ordered attribute, renumber the value indices */
+ ordered_value_sort( a, 1 );
}
return_results:;
@@ -357,22 +387,32 @@ modify_increment_values(
if ( !strcmp( a->a_desc->ad_type->sat_syntax_oid, SLAPD_INTEGER_SYNTAX )) {
int i;
char str[sizeof(long)*3 + 2]; /* overly long */
- long incr = atol( mod->sm_values[0].bv_val );
+ long incr;
+
+ if ( lutil_atol( &incr, mod->sm_values[0].bv_val ) != 0 ) {
+ *text = "modify/increment: invalid syntax of increment";
+ return LDAP_INVALID_SYNTAX;
+ }
/* treat zero and errors as a no-op */
if( incr == 0 ) {
return LDAP_SUCCESS;
}
- for( i=0; a->a_nvals[i].bv_val != NULL; i++ ) {
+ for( i = 0; !BER_BVISNULL( &a->a_nvals[i] ); i++ ) {
char *tmp;
- long value = atol( a->a_nvals[i].bv_val );
- size_t strln = snprintf( str, sizeof(str), "%ld", value+incr );
+ long value;
+ size_t strln;
+ if ( lutil_atol( &value, a->a_nvals[i].bv_val ) != 0 ) {
+ *text = "modify/increment: invalid syntax of original value";
+ return LDAP_INVALID_SYNTAX;
+ }
+ strln = snprintf( str, sizeof(str), "%ld", value+incr );
tmp = SLAP_REALLOC( a->a_nvals[i].bv_val, strln+1 );
if( tmp == NULL ) {
*text = "modify/increment: reallocation error";
- return LDAP_OTHER;;
+ return LDAP_OTHER;
}
a->a_nvals[i].bv_val = tmp;
a->a_nvals[i].bv_len = strln;
@@ -407,14 +447,16 @@ slap_mod_free(
void
slap_mods_free(
- Modifications *ml )
+ Modifications *ml,
+ int freevals )
{
Modifications *next;
for ( ; ml != NULL; ml = next ) {
next = ml->sml_next;
- slap_mod_free( &ml->sml_mod, 0 );
+ if ( freevals )
+ slap_mod_free( &ml->sml_mod, 0 );
free( ml );
}
}