/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
static int slap_mods2entry(
Modifications *mods,
Entry **e,
- const char **text );
+ int repl_user,
+ const char **text,
+ char *textbuf, size_t textlen );
int
do_add( Connection *conn, Operation *op )
*/
/* get the name */
- if ( ber_scanf( ber, "{o", /*}*/ &dn ) == LBER_ERROR ) {
+ if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
}
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
- e->e_name.bv_val = NULL;
- e->e_name.bv_len = 0;
- e->e_nname.bv_val = NULL;
- e->e_nname.bv_len = 0;
- e->e_attrs = NULL;
- e->e_private = NULL;
rc = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
{
Modifications *mod;
- rc = ber_scanf( ber, "{o{W}}", &tmp.sml_type, &tmp.sml_bvalues );
+ rc = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_bvalues );
if ( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
free( tmp.sml_type.bv_val );
goto done;
}
- mod = (Modifications *) ch_malloc( sizeof(Modifications)
- + tmp.sml_type.bv_len + 1);
+ mod = (Modifications *) ch_malloc( sizeof(Modifications) );
mod->sml_op = LDAP_MOD_ADD;
mod->sml_next = NULL;
mod->sml_desc = NULL;
- mod->sml_type.bv_val = (char *)(mod+1);
- strcpy(mod->sml_type.bv_val, tmp.sml_type.bv_val);
- mod->sml_type.bv_len = tmp.sml_type.bv_len;
+ mod->sml_type = tmp.sml_type;
mod->sml_bvalues = tmp.sml_bvalues;
*modtail = mod;
*/
be = select_backend( &e->e_nname, manageDSAit, 0 );
if ( be == NULL ) {
- BVarray ref = referral_rewrite( default_referral,
+ BerVarray ref = referral_rewrite( default_referral,
NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, ref ? ref : default_referral, NULL );
- bvarray_free( ref );
+ if ( ref ) ber_bvarray_free( ref );
goto done;
}
goto done;
}
- if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && !repl_user )
- {
+ if ( SLAP_LASTMOD(be) && !repl_user ) {
for( modtail = &modlist;
*modtail != NULL;
modtail = &(*modtail)->sml_next )
}
}
- rc = slap_mods2entry( modlist, &e, &text );
+ rc = slap_mods2entry( modlist, &e, repl_user, &text,
+ textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
#ifndef SLAPD_MULTIMASTER
} else {
- BVarray defref = be->be_update_refs
+ BerVarray defref = be->be_update_refs
? be->be_update_refs : default_referral;
- BVarray ref = referral_rewrite( defref,
+ BerVarray ref = referral_rewrite( defref,
NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
ref ? ref : defref, NULL );
- bvarray_free( ref );
+ if ( ref ) ber_bvarray_free( ref );
#endif
}
} else {
}
done:
- free( dn.bv_val );
-
if( modlist != NULL ) {
slap_mods_free( modlist );
}
static int slap_mods2entry(
Modifications *mods,
Entry **e,
- const char **text )
+ int repl_user,
+ const char **text,
+ char *textbuf, size_t textlen )
{
Attribute **tail = &(*e)->e_attrs;
assert( *tail == NULL );
+ *text = textbuf;
+
for( ; mods != NULL; mods = mods->sml_next ) {
Attribute *attr;
#ifdef SLURPD_FRIENDLY
ber_len_t i,j;
+ if( !repl_user ) {
+ snprintf( textbuf, textlen,
+ "attribute '%s' provided more than once",
+ mods->sml_desc->ad_cname.bv_val );
+ return LDAP_TYPE_OR_VALUE_EXISTS;
+ }
+
for( i=0; attr->a_vals[i].bv_val; i++ ) {
/* count them */
}
sizeof( struct berval ) * (i+j) );
/* should check for duplicates */
+
AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
sizeof( struct berval ) * j );
continue;
#else
- *text = "attribute provided more than once";
+ snprintf( textbuf, textlen,
+ "attribute '%s' provided more than once",
+ mods->sml_desc->ad_cname.bv_val );
return LDAP_TYPE_OR_VALUE_EXISTS;
#endif
}
+ if( mods->sml_bvalues[1].bv_val != NULL ) {
+ /* check for duplicates */
+ int i, j;
+ MatchingRule *mr = mods->sml_desc->ad_type->sat_equality;
+
+ /* check if the values we're adding already exist */
+ if( mr == NULL || !mr->smr_match ) {
+ for ( i = 0; mods->sml_bvalues[i].bv_val != NULL; i++ ) {
+ /* test asserted values against themselves */
+ for( j = 0; j < i; j++ ) {
+ int rc = ber_bvcmp( &mods->sml_bvalues[i],
+ &mods->sml_bvalues[j] );
+
+ if( rc == 0 ) {
+ /* value exists already */
+ snprintf( textbuf, textlen,
+ "%s: value #%d provided more than once",
+ mods->sml_desc->ad_cname.bv_val, j );
+ return LDAP_TYPE_OR_VALUE_EXISTS;
+ }
+ }
+ }
+
+ } else {
+ for ( i = 0; mods->sml_bvalues[i].bv_val != NULL; i++ ) {
+ int rc, match;
+ const char *text = NULL;
+ struct berval asserted;
+
+ rc = value_normalize( mods->sml_desc,
+ SLAP_MR_EQUALITY,
+ &mods->sml_bvalues[i],
+ &asserted,
+ &text );
+
+ if( rc != LDAP_SUCCESS ) return rc;
+
+ for ( j = 0; j < i; j++ ) {
+ int rc = value_match( &match, mods->sml_desc, mr,
+ SLAP_MR_VALUE_SYNTAX_MATCH,
+ &mods->sml_bvalues[j], &asserted, &text );
+
+ if( rc == LDAP_SUCCESS && match == 0 ) {
+ free( asserted.bv_val );
+ snprintf( textbuf, textlen,
+ "%s: value #%d provided more than once",
+ mods->sml_desc->ad_cname.bv_val, j );
+ return LDAP_TYPE_OR_VALUE_EXISTS;
+ }
+ }
+
+ free( asserted.bv_val );
+ }
+ }
+ }
+
attr = ch_calloc( 1, sizeof(Attribute) );
/* move ad to attr structure */