/* $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 )
ber_tag_t tag;
Entry *e;
Backend *be;
- LDAPModList *modlist = NULL;
- LDAPModList **modtail = &modlist;
- Modifications *mods = NULL;
+ Modifications *modlist = NULL;
+ Modifications **modtail = &modlist;
+ Modifications tmp;
const char *text;
int rc = LDAP_SUCCESS;
int manageDSAit;
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "do_add: conn %d enter\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", conn->c_connid,0,0 );
#else
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
#endif
*/
/* 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 ));
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d ber_scanf failed\n", conn->c_connid,0,0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
#endif
}
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;
- {
- struct berval *pdn = NULL;
- rc = dnPretty( NULL, &dn, &pdn );
-
- if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_add: conn %d invalid dn (%s)\n", conn->c_connid,
- dn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid DN", NULL, NULL );
- goto done;
- }
+ rc = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
- e->e_name = *pdn;
- free( pdn );
- }
-
- {
- struct berval *ndn = NULL;
- rc = dnNormalize( NULL, &dn, &ndn );
-
- if( rc != LDAP_SUCCESS ) {
+ if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_add: conn %d invalid dn (%s)\n", conn->c_connid,
- dn.bv_val ));
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn.bv_val, 0 );
#else
- Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
#endif
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
"invalid DN", NULL, NULL );
- goto done;
- }
-
- e->e_nname = *ndn;
- free( ndn );
+ goto done;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
- "do_add: conn %d dn (%s)\n", conn->c_connid, e->e_dn ));
+ LDAP_LOG( OPERATION, ARGS,
+ "do_add: conn %d dn (%s)\n", conn->c_connid, e->e_dn, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", e->e_dn, 0, 0 );
#endif
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )
{
- LDAPModList *mod = (LDAPModList *) ch_malloc( sizeof(LDAPModList) );
- mod->ml_op = LDAP_MOD_ADD;
- mod->ml_next = NULL;
+ Modifications *mod;
+ ber_tag_t rtag;
- rc = ber_scanf( ber, "{a{V}}", &mod->ml_type, &mod->ml_bvalues );
+ rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_bvalues );
- if ( rc == LBER_ERROR ) {
+ if ( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_add: conn %d decoding error \n", conn->c_connid ));
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d decoding error \n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
rc = -1;
- free( mod );
goto done;
}
- if ( mod->ml_bvalues == NULL ) {
+ if ( tmp.sml_bvalues == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ LDAP_LOG( OPERATION, INFO,
"do_add: conn %d no values for type %s\n",
- conn->c_connid, mod->ml_type ));
+ conn->c_connid, tmp.sml_type.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
- mod->ml_type, 0, 0 );
+ tmp.sml_type.bv_val, 0, 0 );
#endif
send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
NULL, "no values for attribute type", NULL, NULL );
- free( mod->ml_type );
- free( mod );
goto done;
}
+ mod = (Modifications *) ch_malloc( sizeof(Modifications) );
+
+ mod->sml_op = LDAP_MOD_ADD;
+ mod->sml_next = NULL;
+ mod->sml_desc = NULL;
+ mod->sml_type = tmp.sml_type;
+ mod->sml_bvalues = tmp.sml_bvalues;
*modtail = mod;
- modtail = &mod->ml_next;
+ modtail = &mod->sml_next;
}
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d ber_scanf failed\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
#endif
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_add: conn %d get_ctrls failed\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, INFO,
+ "do_add: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
#endif
goto done;
}
- Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
+ Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu ADD dn=\"%s\"\n",
op->o_connid, op->o_opid, e->e_dn, 0, 0 );
- if( e->e_ndn == NULL || *e->e_ndn == '\0' ) {
+ if( e->e_nname.bv_len == 0 ) {
/* protocolError may be a more appropriate error */
send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
NULL, "root DSE already exists",
goto done;
#if defined( SLAPD_SCHEMA_DN )
- } else if ( strcasecmp( e->e_ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+ } else if ( bvmatch( &e->e_nname, &global_schemandn ) ) {
send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
NULL, "subschema subentry already exists",
NULL, NULL );
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- be = select_backend( e->e_ndn, manageDSAit, 0 );
+ be = select_backend( &e->e_nname, manageDSAit, 0 );
if ( be == NULL ) {
- struct berval **ref = referral_rewrite( default_referral,
- NULL, e->e_dn, LDAP_SCOPE_DEFAULT );
+ 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 );
- ber_bvecfree( ref );
+ if ( ref ) ber_bvarray_free( ref );
goto done;
}
}
/* check for referrals */
- rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn );
+ rc = backend_check_referrals( be, conn, op, &e->e_name, &e->e_nname );
if ( rc != LDAP_SUCCESS ) {
goto done;
}
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf;
- rc = slap_modlist2mods( modlist, update, &mods, &text,
+ rc = slap_mods_check( modlist, update, &text,
textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
goto done;
}
- if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && !repl_user )
- {
- Modifications **modstail;
- for( modstail = &mods;
- *modstail != NULL;
- modstail = &(*modstail)->sml_next )
+ if ( !repl_user ) {
+ for( modtail = &modlist;
+ *modtail != NULL;
+ modtail = &(*modtail)->sml_next )
{
- assert( (*modstail)->sml_op == LDAP_MOD_ADD );
- assert( (*modstail)->sml_desc != NULL );
+ assert( (*modtail)->sml_op == LDAP_MOD_ADD );
+ assert( (*modtail)->sml_desc != NULL );
}
- rc = slap_mods_opattrs( op, mods, modstail, &text,
+ rc = slap_mods_opattrs( be, op, modlist, modtail, &text,
textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
}
}
- rc = slap_mods2entry( mods, &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 );
if ( !repl_user )
#endif
{
- replog( be, op, e->e_dn, e->e_ndn, e );
+ replog( be, op, &e->e_name, &e->e_nname, e );
}
be_entry_release_w( be, conn, op, e );
e = NULL;
#ifndef SLAPD_MULTIMASTER
} else {
- struct berval **defref = be->be_update_refs
+ BerVarray defref = be->be_update_refs
? be->be_update_refs : default_referral;
- struct berval **ref = referral_rewrite( defref,
- NULL, e->e_dn, LDAP_SCOPE_DEFAULT );
+ 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 );
- ber_bvecfree( ref );
+ if ( ref ) ber_bvarray_free( ref );
#endif
}
} else {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_add: conn %d no backend support\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, INFO,
+ "do_add: conn %d no backend support\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
#endif
}
done:
- free( dn.bv_val );
-
if( modlist != NULL ) {
- slap_modlist_free( modlist );
- }
- if( mods != NULL ) {
- slap_mods_free( mods );
+ slap_mods_free( modlist );
}
if( e != NULL ) {
entry_free( e );
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;
- for( i=0; attr->a_vals[i]; i++ ) {
+ 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 */
}
- for( j=0; mods->sml_bvalues[j]; j++ ) {
+ for( j=0; mods->sml_bvalues[j].bv_val; j++ ) {
/* count them */
}
j++; /* NULL */
attr->a_vals = ch_realloc( attr->a_vals,
- sizeof( struct berval * ) * (i+j) );
+ sizeof( struct berval ) * (i+j) );
/* should check for duplicates */
+
AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
- sizeof( struct berval * ) * j );
+ sizeof( struct berval ) * j );
/* trim the mods array */
ch_free( mods->sml_bvalues );
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 */
projects / openldap / blobdiff