/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
#include "portable.h"
#include <stdio.h>
-
#include <ac/string.h>
#include <ac/time.h>
#include <ac/socket.h>
#include "ldap_pvt.h"
#include "slap.h"
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-static int slap_mods2entry(
- Modifications *mods,
- Entry **e,
- char **text );
-#else
-static int add_created_attrs(Operation *op, Entry *e);
-#endif
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+static void initAddPlugin( Operation *op,
+ struct berval *dn, Entry *e, int manageDSAit );
+static int doPreAddPluginFNs( Operation *op );
+static void doPostAddPluginFNs( Operation *op );
+#endif /* LDAP_SLAPI */
int
-do_add( Connection *conn, Operation *op )
+do_add( Operation *op, SlapReply *rs )
{
BerElement *ber = op->o_ber;
- char *dn, *ndn, *last;
+ char *last;
+ struct berval dn = { 0, NULL };
ber_len_t len;
ber_tag_t tag;
Entry *e;
- Backend *be;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- LDAPModList *modlist = NULL;
- LDAPModList **modtail = &modlist;
- Modifications *mods = NULL;
-#endif
- char *text;
- int rc = LDAP_SUCCESS;
+ Modifications *modlist = NULL;
+ Modifications **modtail = &modlist;
+ Modifications tmp;
+ int manageDSAit;
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", op->o_connid,0,0 );
+#else
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
-
+#endif
/*
* Parse the add request. It looks like this:
*
*/
/* get the name */
- if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
+ if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d ber_scanf failed\n", op->o_connid,0,0 );
+#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
- send_ldap_disconnect( conn, op,
- LDAP_PROTOCOL_ERROR, "decoding error" );
+#endif
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
return -1;
}
- ndn = ch_strdup( dn );
+ e = (Entry *) ch_calloc( 1, sizeof(Entry) );
- if ( dn_normalize( ndn ) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
- send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid DN", NULL, NULL );
- free( dn );
- free( ndn );
- return LDAP_INVALID_DN_SYNTAX;
- }
+ rs->sr_err = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
- e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+ if( rs->sr_err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d invalid dn (%s)\n", op->o_connid, dn.bv_val, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
+#endif
+ send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
+ goto done;
+ }
- e->e_dn = dn;
- e->e_ndn = ndn;
- e->e_attrs = NULL;
- e->e_private = NULL;
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ARGS,
+ "do_add: conn %d dn (%s)\n", op->o_connid, e->e_dn, 0 );
+#else
+ Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", e->e_dn, 0, 0 );
+#endif
- Debug( LDAP_DEBUG_ARGS, " do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
+ op->o_req_dn = e->e_name;
+ op->o_req_ndn = e->e_nname;
/* get the attrs */
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
- tag = ber_next_element( ber, &len, last ) ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- LDAPModList *mod = (LDAPModList *) ch_malloc( sizeof(LDAPModList) );
-#else
- LDAPModList tmpmod;
- LDAPModList *mod = &tmpmod;
+ tag = ber_next_element( ber, &len, last ) )
+ {
+ Modifications *mod;
+ ber_tag_t rtag;
+
+#ifdef SLAP_NVALUES
+ tmp.sml_nvalues = NULL;
#endif
- mod->ml_op = LDAP_MOD_ADD;
- mod->ml_next = NULL;
- rc = ber_scanf( ber, "{a{V}}", &mod->ml_type, &mod->ml_bvalues );
+ rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_values );
- if ( rc == LBER_ERROR ) {
- send_ldap_disconnect( conn, op,
- LDAP_PROTOCOL_ERROR, "decoding error" );
- rc = -1;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- free( mod );
+ if ( rtag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d decoding error \n", op->o_connid, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
#endif
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+ rs->sr_err = -1;
goto done;
}
- if ( mod->ml_bvalues == NULL ) {
+ if ( tmp.sml_values == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO,
+ "do_add: conn %d no values for type %s\n",
+ op->o_connid, tmp.sml_type.bv_val, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
- mod->ml_type, 0, 0 );
- send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
- NULL, "no values for type", NULL, NULL );
- free( mod->ml_type );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- free( mod );
+ tmp.sml_type.bv_val, 0, 0 );
#endif
+ send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, "no values for attribute type" );
goto done;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- (*modtail)->ml_next = mod;
- modtail = &mod->ml_next;
-#else
- attr_merge( e, mod->ml_type, mod->ml_bvalues );
-
- free( mod->ml_type );
- ber_bvecfree( mod->ml_bvalues );
+ 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_values = tmp.sml_values;
+#ifdef SLAP_NVALUES
+ mod->sml_nvalues = NULL;
#endif
+
+ *modtail = mod;
+ modtail = &mod->sml_next;
}
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "do_add: conn %d ber_scanf failed\n", op->o_connid, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
- send_ldap_disconnect( conn, op,
- LDAP_PROTOCOL_ERROR, "decoding error" );
- rc = -1;
+#endif
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+ rs->sr_err = -1;
goto done;
}
- if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+ if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO,
+ "do_add: conn %d get_ctrls failed\n", op->o_connid, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
+#endif
goto done;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( modlist == NULL )
-#else
- if ( e->e_attrs == NULL )
-#endif
- {
- send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
- NULL, "No attributes provided", NULL, NULL );
+ if ( modlist == NULL ) {
+ send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, "no attributes provided" );
goto done;
}
- Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
- op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
+ Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu ADD dn=\"%s\"\n",
+ op->o_connid, op->o_opid, e->e_name.bv_val, 0, 0 );
+
+ if( e->e_nname.bv_len == 0 ) {
+ /* protocolError may be a more appropriate error */
+ send_ldap_error( op, rs, LDAP_ALREADY_EXISTS, "root DSE already exists" );
+ goto done;
+
+ } else if ( bvmatch( &e->e_nname, &global_schemandn ) ) {
+ send_ldap_error( op, rs, LDAP_ALREADY_EXISTS, "subschema subentry already exists" );
+ goto done;
+ }
+
+ manageDSAit = get_manageDSAit( op );
/*
* We could be serving multiple database backends. Select the
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- be = select_backend( e->e_ndn );
- if ( be == NULL ) {
- send_ldap_result( conn, op, rc = LDAP_REFERRAL,
- NULL, NULL, default_referral, NULL );
+ op->o_bd = select_backend( &e->e_nname, manageDSAit, 0 );
+ if ( op->o_bd == NULL ) {
+ rs->sr_ref = referral_rewrite( default_referral,
+ NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+
+ rs->sr_err = LDAP_REFERRAL;
+ if (!rs->sr_ref) rs->sr_ref = default_referral;
+ send_ldap_result( op, rs );
+
+ if ( rs->sr_ref != default_referral ) ber_bvarray_free( rs->sr_ref );
goto done;
}
- /* make sure this backend recongizes critical controls */
- rc = backend_check_controls( be, conn, op, &text ) ;
-
- if( rc != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
+ /* check restrictions */
+ if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
goto done;
}
- if ( global_readonly || be->be_readonly ) {
- Debug( LDAP_DEBUG_ANY, "do_add: database is read-only\n",
- 0, 0, 0 );
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "database is read-only", NULL, NULL );
+ /* check for referrals */
+ if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
goto done;
}
+#ifdef LDAP_SLAPI
+ initAddPlugin( op, &dn, e, manageDSAit );
+#endif /* LDAP_SLAPI */
+
/*
* do the add if 1 && (2 || 3)
* 1) there is an add function implemented in this backend;
* 2) this backend is master for what it holds;
* 3) it's a replica and the dn supplied is the updatedn.
*/
- if ( be->be_add ) {
+ if ( op->o_bd->be_add ) {
/* do the update here */
-#ifdef SLAPD_MULTIMASTER
- if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && (be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn )) )
-#else
- if ( be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+ int repl_user = be_isupdate(op->o_bd, &op->o_ndn );
+#ifndef SLAPD_MULTIMASTER
+ if ( !op->o_bd->be_update_ndn.bv_len || repl_user )
#endif
{
- int update = be->be_update_ndn != NULL;
+ int update = op->o_bd->be_update_ndn.bv_len;
+ char textbuf[SLAP_TEXT_BUFLEN];
+ size_t textlen = sizeof textbuf;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = slap_modlist2mods( modlist, update, &mods, &text );
- if( rc != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
+ rs->sr_err = slap_mods_check( modlist, update, &rs->sr_text,
+ textbuf, textlen );
+
+ if( rs->sr_err != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
goto done;
}
-#endif
-#ifndef SLAPD_MULTIMASTER
- if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && !update )
-#endif
- {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = slap_mods_opattrs( op, &mods, &text );
-#else
- char *text = "no-user-modification attribute type";
- rc = add_created_attrs( op, e );
-#endif
- if( rc != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
+ if ( !repl_user ) {
+ for( modtail = &modlist;
+ *modtail != NULL;
+ modtail = &(*modtail)->sml_next )
+ {
+ assert( (*modtail)->sml_op == LDAP_MOD_ADD );
+ assert( (*modtail)->sml_desc != NULL );
+ }
+ rs->sr_err = slap_mods_opattrs( op, modlist, modtail,
+ &rs->sr_text, textbuf, textlen );
+ if( rs->sr_err != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
goto done;
}
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = slap_mods2entry( mods, &e, &text );
- if( rc != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
+ rs->sr_err = slap_mods2entry( modlist, &e, repl_user, &rs->sr_text,
+ textbuf, textlen );
+ if( rs->sr_err != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
goto done;
}
-#endif
- if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
+#ifdef LDAP_SLAPI
+ /*
+ * Call the preoperation plugin here, because the entry
+ * will actually contain something.
+ */
+ rs->sr_err = doPreAddPluginFNs( op );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ /* plugin will have sent result */
+ goto done;
+ }
+#endif /* LDAP_SLAPI */
+
+ op->ora_e = e;
+ if ( (op->o_bd->be_add)( op, rs ) == 0 ) {
#ifdef SLAPD_MULTIMASTER
- if (be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn ))
+ if ( !repl_user )
#endif
{
- replog( be, op, e->e_dn, e );
+ replog( op );
}
- be_entry_release_w( be, e );
+ be_entry_release_w( op, e );
+ e = NULL;
}
- e = NULL;
#ifndef SLAPD_MULTIMASTER
} else {
- send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
- be->be_update_refs ? be->be_update_refs : default_referral, NULL );
-#endif
+ BerVarray defref;
+ BerVarray ref;
+#ifdef LDAP_SLAPI
+ /*
+ * SLAPI_ADD_ENTRY will be empty, but this may be acceptable
+ * on replicas (for now, it involves the minimum code intrusion).
+ */
+ rs->sr_err = doPreAddPluginFNs( op );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ /* plugin will have sent result */
+ goto done;
+ }
+#endif /* LDAP_SLAPI */
+
+ defref = op->o_bd->be_update_refs
+ ? op->o_bd->be_update_refs : default_referral;
+ rs->sr_ref = referral_rewrite( defref,
+ NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+
+ rs->sr_err = LDAP_REFERRAL;
+ if (!rs->sr_ref) rs->sr_ref = default_referral;
+ send_ldap_result( op, rs );
+
+ if ( rs->sr_ref != default_referral ) ber_bvarray_free( rs->sr_ref );
+#endif /* SLAPD_MULTIMASTER */
}
} else {
- Debug( LDAP_DEBUG_ARGS, " do_add: HHH\n", 0, 0, 0 );
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "Function not implemented", NULL, NULL );
+#ifdef LDAP_SLAPI
+ rs->sr_err = doPreAddPluginFNs( op );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ /* plugin will have sent result */
+ goto done;
+ }
+#endif
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO,
+ "do_add: conn %d no backend support\n", op->o_connid, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
+#endif
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "operation not supported within namingContext" );
}
+#ifdef LDAP_SLAPI
+ doPostAddPluginFNs( op );
+#endif /* LDAP_SLAPI */
+
done:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
if( modlist != NULL ) {
- slap_modlist_free( modlist );
+ slap_mods_free( modlist );
}
- if( mods != NULL ) {
- slap_mods_free( mods );
- }
-#endif
if( e != NULL ) {
entry_free( e );
}
- return rc;
+ return rs->sr_err;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-static int slap_mods2entry(
+int
+slap_mods2entry(
Modifications *mods,
Entry **e,
- 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;
assert( mods->sml_op == LDAP_MOD_ADD );
+ assert( mods->sml_desc != NULL );
attr = attr_find( (*e)->e_attrs, mods->sml_desc );
if( attr != NULL ) {
- *text = "Attribute provided more than once";
- return LDAP_OPERATIONS_ERROR;
+#define SLURPD_FRIENDLY
+#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 */
+ }
+ for( j=0; mods->sml_values[j].bv_val; j++ ) {
+ /* count them */
+ }
+ j++; /* NULL */
+
+ attr->a_vals = ch_realloc( attr->a_vals,
+ sizeof( struct berval ) * (i+j) );
+
+ /* should check for duplicates */
+
+ AC_MEMCPY( &attr->a_vals[i], mods->sml_values,
+ sizeof( struct berval ) * j );
+
+ /* trim the mods array */
+ ch_free( mods->sml_values );
+ mods->sml_values = NULL;
+
+#ifdef SLAP_NVALUES
+ if( mods->sml_nvalues ) {
+ attr->a_nvals = ch_realloc( attr->a_nvals,
+ sizeof( struct berval ) * (i+j) );
+
+ AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
+ sizeof( struct berval ) * j );
+
+ /* trim the mods array */
+ ch_free( mods->sml_nvalues );
+ mods->sml_nvalues = NULL;
+ } else {
+ attr->a_nvals = attr->a_vals;
+ }
+#endif
+
+ continue;
+#else
+ 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_values[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++ ) {
+ if ( bvmatch( &mods->sml_bvalues[i],
+ &mods->sml_bvalues[j] ) ) {
+ /* 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 {
+ int rc;
+#ifdef SLAP_NVALUES
+ int match;
+
+ for ( i = 0; mods->sml_nvalues[i].bv_val != NULL; i++ ) {
+ /* test asserted values against themselves */
+ for( j = 0; j < i; j++ ) {
+ rc = value_match( &match, mods->sml_desc, mr,
+ SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX
+ | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
+ | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+ &mods->sml_nvalues[i], &mods->sml_nvalues[j], text );
+ if ( rc == LDAP_SUCCESS && match == 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
+ rc = modify_check_duplicates( mods->sml_desc, mr,
+ NULL, mods->sml_bvalues, 0,
+ text, textbuf, textlen );
+#endif
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+ }
}
attr = ch_calloc( 1, sizeof(Attribute) );
- /* should check for duplicates */
- attr->a_vals = mods->sml_bvalues;
- mods->sml_bvalues = NULL;
+ /* move ad to attr structure */
+ attr->a_desc = mods->sml_desc;
+ mods->sml_desc = NULL;
+
+ /* move values to attr structure */
+ /* should check for duplicates */
+ attr->a_vals = mods->sml_values;
+ mods->sml_values = NULL;
+
+#ifdef SLAP_NVALUES
+ if ( mods->sml_nvalues ) {
+ attr->a_nvals = mods->sml_nvalues;
+ mods->sml_nvalues = NULL;
+ } else {
+ attr->a_nvals = attr->a_vals;
+ }
+#endif
*tail = attr;
tail = &attr->a_next;
return LDAP_SUCCESS;
}
-#else
-static int
-add_created_attrs( Operation *op, Entry *e )
+#ifdef LDAP_SLAPI
+static void initAddPlugin( Operation *op,
+ struct berval *dn, Entry *e, int manageDSAit )
{
- char buf[22];
- struct berval bv;
- struct berval *bvals[2];
- Attribute *a;
- struct tm *ltm;
- time_t currenttime;
-
- Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 );
-
- bvals[0] = &bv;
- bvals[1] = NULL;
-
- /* return error on any attempts by the user to add these attrs */
- for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( is_at_no_user_mod( a->a_desc.ad_type ))
+ slapi_x_pblock_set_operation( op->o_pb, op );
+ slapi_pblock_set( op->o_pb, SLAPI_ADD_TARGET, (void *)dn->bv_val );
+ slapi_pblock_set( op->o_pb, SLAPI_ADD_ENTRY, (void *)e );
+ slapi_pblock_set( op->o_pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
+}
+
+static int doPreAddPluginFNs( Operation *op )
+{
+ int rc;
+
+ rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_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
- if ( oc_check_op_no_usermod_attr( a->a_type ) )
+ Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
+ 0, 0, 0);
+ if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
+ rc = LDAP_OTHER;
#endif
- {
- return LDAP_CONSTRAINT_VIOLATION;
- }
- }
-
- if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- bv.bv_val = "<anonymous>";
- bv.bv_len = sizeof("<anonymous>")-1;
-;
} else {
- bv.bv_val = op->o_dn;
- bv.bv_len = strlen( bv.bv_val );
+ rc = LDAP_SUCCESS;
}
- attr_merge( e, "creatorsname", bvals );
- attr_merge( e, "modifiersname", bvals );
- currenttime = slap_get_time();
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
- ltm = gmtime( ¤ttime );
- strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+ return rc;
+}
- bv.bv_val = buf;
- bv.bv_len = strlen( bv.bv_val );
- attr_merge( e, "createtimestamp", bvals );
- attr_merge( e, "modifytimestamp", bvals );
+static void doPostAddPluginFNs( Operation *op )
+{
+ int rc;
- return LDAP_SUCCESS;
-}
+ rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb );
+ if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO, "do_add: add postoperation plugin failed\n",
+ 0, 0, 0);
+#else
+ Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
+ 0, 0, 0);
#endif
+ }
+}
+#endif /* LDAP_SLAPI */
projects / openldap / blobdiff