/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
#include "ldap_pvt.h"
#include "slap.h"
-
-static int slap_mods2entry(
- Modifications *mods,
- Entry **e,
- int repl_user,
- const char **text,
- char *textbuf, size_t textlen );
+#include "slapi.h"
int
do_add( Connection *conn, Operation *op )
Modifications **modtail = &modlist;
Modifications tmp;
const char *text;
+ LDAPRDN *rdn = NULL;
+ int a_cnt;
int rc = LDAP_SUCCESS;
int manageDSAit;
+ Slapi_PBlock *pb = op->o_pb;
+
#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, "{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;
rc = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
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 );
#endif
}
#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
tag = ber_next_element( ber, &len, last ) )
{
Modifications *mod;
+ ber_tag_t rtag;
- rc = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_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
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, tmp.sml_type.bv_val ));
+ conn->c_connid, tmp.sml_type.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
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( tmp.sml_type.bv_val );
goto done;
}
mod = (Modifications *) ch_malloc( sizeof(Modifications) );
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_nname.bv_len == 0 ) {
NULL, NULL );
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 );
goto done;
-#endif
+ }
+
+ /*
+ * Get attribute type(s) and attribute value(s) of our rdn,
+ */
+ if ( ldap_bv2rdn( &e->e_name, &rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX,
+ NULL, "unknown type(s) used in RDN",
+ NULL, NULL );
+ goto done;
+ }
+
+ /* Check for RDN attrs in entry */
+ for ( a_cnt = 0; rdn[ 0 ][ a_cnt ]; a_cnt++ ) {
+ AttributeDescription *desc = NULL;
+ Modifications *mod;
+ MatchingRule *mr;
+ int i;
+
+ rc = slap_bv2ad( &rdn[ 0 ][ a_cnt ]->la_attr,
+ &desc, &text );
+
+ if ( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL );
+ goto done;
+ }
+
+ for (mod = modlist; mod; mod = mod->sml_next) {
+ AttributeDescription *mod_desc = NULL;
+
+ rc = slap_bv2ad( &mod->sml_type,
+ &mod_desc, &text );
+ if ( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL );
+ goto done;
+ }
+
+ if (mod_desc == desc) {
+ break;
+ }
+ }
+
+ if (mod == NULL) {
+#ifdef BAILOUT
+ /* for now, bail out; we might end up
+ * adding the missing value, as iPlanet
+ * allegedly does */
+ send_ldap_result( conn, op,
+ rc = LDAP_CONSTRAINT_VIOLATION,
+ NULL,
+ "attribute in RDN not listed in entry",
+ NULL, NULL );
+ goto done;
+
+#else /* ! BAILOUT */
+ struct berval bv;
+
+ mod = (Modifications *) ch_malloc( sizeof(Modifications) );
+
+ mod->sml_op = LDAP_MOD_ADD;
+ mod->sml_next = NULL;
+ mod->sml_desc = NULL;
+
+ ber_dupbv( &mod->sml_type,
+ &rdn[ 0 ][ a_cnt ]->la_attr );
+
+ mod->sml_bvalues = NULL;
+ ber_dupbv( &bv, &rdn[ 0 ][ a_cnt ]->la_value );
+ ber_bvarray_add( &mod->sml_bvalues, &bv );
+
+ *modtail = mod;
+ modtail = &mod->sml_next;
+ continue;
+#endif /* ! BAILOUT */
+ }
+
+ mr = desc->ad_type->sat_equality;
+ if (mr == NULL || !mr->smr_match ) {
+ /* brrrr ... */
+ continue;
+ }
+
+ for (i = 0; mod->sml_bvalues[ i ].bv_val; i++) {
+ int match = 0;
+
+ rc = value_match(&match, desc, mr,
+ SLAP_MR_VALUE_SYNTAX_MATCH,
+ &mod->sml_bvalues[ i ],
+ &rdn[ 0 ][ a_cnt ]->la_value, &text);
+
+ if ( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL);
+ goto done;
+ }
+
+ if (match == 0) {
+ break;
+ }
+ }
+
+ /* not found? */
+ if (mod->sml_bvalues[ i ].bv_val == NULL) {
+#ifdef BAILOUT
+ send_ldap_result( conn, op,
+ rc = LDAP_CONSTRAINT_VIOLATION,
+ NULL,
+ "value in RDN not listed in entry",
+ NULL, NULL );
+ goto done;
+#else /* ! BAILOUT */
+ struct berval bv;
+
+ ber_dupbv( &bv, &rdn[ 0 ][ a_cnt ]->la_value );
+ ber_bvarray_add( &mod->sml_bvalues, &bv );
+ continue;
+#endif /* ! BAILOUT */
+ }
}
manageDSAit = get_manageDSAit( op );
goto done;
}
+#if defined( LDAP_SLAPI )
+ slapi_x_backend_set_pb( pb, be );
+ slapi_x_connection_set_pb( pb, conn );
+ slapi_x_operation_set_pb( pb, op );
+ slapi_pblock_set( pb, SLAPI_ADD_ENTRY, (void *)e );
+ slapi_pblock_set( pb, SLAPI_ADD_TARGET, (void *)dn.bv_val );
+ slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
+
+ rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_ADD_FN, pb );
+ if ( rc != 0 ) {
+ /*
+ * A preoperation plugin failure will abort the
+ * entire operation.
+ */
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO, "do_add: add preoperation plugin failed\n",
+ 0, 0, 0);
+#else
+ Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
+ 0, 0, 0);
+ if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
+ rc = LDAP_OTHER;
+ goto done;
+#endif
+ }
+#endif /* defined( LDAP_SLAPI ) */
+
/*
* do the add if 1 && (2 || 3)
* 1) there is an add function implemented in this backend;
goto done;
}
- if ( SLAP_LASTMOD(be) && !repl_user ) {
+ if ( !repl_user ) {
for( modtail = &modlist;
*modtail != NULL;
modtail = &(*modtail)->sml_next )
assert( (*modtail)->sml_op == LDAP_MOD_ADD );
assert( (*modtail)->sml_desc != NULL );
}
- rc = slap_mods_opattrs( op, modlist, modtail, &text,
+ rc = slap_mods_opattrs( be, op, modlist, modtail, &text,
textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
}
} 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
NULL, "operation not supported within namingContext", NULL, NULL );
}
+#if defined( LDAP_SLAPI )
+ /*
+ * Postoperation errors are silently ignored; the work has
+ * been done.
+ */
+ if ( doPluginFNs( be, SLAPI_PLUGIN_POST_ADD_FN, pb ) != 0) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO, "do_add: Add postoperation plugins failed\n",
+ 0, 0, 0);
+#else
+ Debug(LDAP_DEBUG_TRACE, "do_add: Add postoperation plugins failed.\n",
+ 0, 0, 0);
+#endif
+ }
+#endif /* defined( LDAP_SLAPI ) */
+
done:
if( modlist != NULL ) {
slap_mods_free( modlist );
return rc;
}
-static int slap_mods2entry(
+int
+slap_mods2entry(
Modifications *mods,
Entry **e,
int repl_user,
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 ) {
+ if ( bvmatch( &mods->sml_bvalues[i],
+ &mods->sml_bvalues[j] ) ) {
/* value exists already */
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
}
} 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 );
+ int rc;
+ const char *text = NULL;
+ char textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' };
+
+ rc = modify_check_duplicates( mods->sml_desc, mr,
+ NULL, mods->sml_bvalues, 0,
+ &text, textbuf, sizeof( textbuf ) );
+
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
}
}
}
projects / openldap / blobdiff