X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=4058b43ebab4471bbaf0858f640a0610683b6df8;hb=b0b3eff457f0e431c4fd094d3d9cfeb6383df91d;hp=93cc3cdcd3b3c74e7eab51c8c35d54632fc5bb19;hpb=4a5d740e2ee4e700e76b2eac6f079e39f0134c94;p=openldap
diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 93cc3cdcd3..4058b43eba 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -10,36 +23,43 @@
* is provided ``as is'' without express or implied warranty.
*/
-#include
-#include
-#include
-#include
-#include
-#include "slap.h"
+#include "portable.h"
-extern Backend *select_backend();
-extern char *dn_normalize();
+#include
+#include
+#include
+#include
-extern char *default_referral;
-extern time_t currenttime;
-extern pthread_mutex_t currenttime_mutex;
-extern int global_lastmod;
+#include "ldap_pvt.h"
+#include "slap.h"
-static void add_created_attrs();
+#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 */
-void
-do_add( conn, op )
- Connection *conn;
- Operation *op;
+int
+do_add( Operation *op, SlapReply *rs )
{
BerElement *ber = op->o_ber;
- char *dn, *last;
- unsigned long len, tag;
+ char *last;
+ struct berval dn = { 0, NULL };
+ ber_len_t len;
+ ber_tag_t tag;
Entry *e;
- Backend *be;
+ 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:
*
@@ -52,147 +72,636 @@ do_add( conn, op )
* }
*/
+ /* get the name */
+ 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 );
+#endif
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+ return -1;
+ }
+
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
- /* initialize reader/writer lock */
- entry_rdwr_init(e);
- /* get the name */
- if ( ber_scanf( ber, "{a", &dn ) == LBER_ERROR ) {
- Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
- send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
- "decoding error" );
- return;
+ rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
+
+ 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;
- dn = dn_normalize( strdup( dn ) );
- Debug( LDAP_DEBUG_ARGS, " do_add: dn (%s)\n", dn, 0, 0 );
+
+ ber_dupbv( &e->e_name, &op->o_req_dn );
+ ber_dupbv( &e->e_nname, &op->o_req_ndn );
+
+#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
/* get the attrs */
- e->e_attrs = NULL;
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
- tag = ber_next_element( ber, &len, last ) ) {
- char *type;
- struct berval **vals;
-
- if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) {
- send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
- NULL, "decoding error" );
- entry_free( e );
- return;
+ tag = ber_next_element( ber, &len, last ) )
+ {
+ Modifications *mod;
+ ber_tag_t rtag;
+
+ tmp.sml_nvalues = NULL;
+
+ rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_values );
+
+ 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 ( vals == NULL ) {
- Debug( LDAP_DEBUG_ANY, "no values for type %s\n", type,
- 0, 0 );
- send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
- NULL );
- entry_free( e );
- return;
+ 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",
+ tmp.sml_type.bv_val, 0, 0 );
+#endif
+ send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+ "no values for attribute type" );
+ goto done;
}
- attr_merge( e, type, vals );
+ 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;
+ mod->sml_nvalues = NULL;
+
+ *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 );
+#endif
+ send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
+ rs->sr_err = -1;
+ goto done;
+ }
+
+ 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;
+ }
+
+ if ( modlist == NULL ) {
+ send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+ "no attributes provided" );
+ goto done;
+ }
+
+ 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 );
- free( type );
- ber_bvecfree( vals );
+ 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;
}
- Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n",
- conn->c_connid, op->o_opid, dn, 0, 0 );
+ 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.
*/
- if ( (be = select_backend( dn )) == NULL ) {
- entry_free( e );
- send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
- default_referral );
- return;
+ 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 );
+ if (!rs->sr_ref) rs->sr_ref = default_referral;
+ if ( rs->sr_ref != NULL ) {
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
+
+ if ( rs->sr_ref != default_referral ) {
+ ber_bvarray_free( rs->sr_ref );
+ }
+ } else {
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "referral missing" );
+ }
+ goto done;
+ }
+
+ /* check restrictions */
+ if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
+ goto done;
+ }
+
+ /* check for referrals */
+ if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
+ goto done;
}
+#ifdef LDAP_SLAPI
+ if ( op->o_pb ) 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 != NULL ) {
+ if ( op->o_bd->be_add ) {
/* do the update here */
- if ( be->be_updatedn == NULL ||
- strcasecmp( be->be_updatedn, op->o_dn ) == 0 ) {
+ int repl_user = be_isupdate(op->o_bd, &op->o_ndn );
+#ifndef SLAPD_MULTIMASTER
+ if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ) &&
+ ( !op->o_bd->be_update_ndn.bv_len || repl_user ))
+#else
+ if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ))
+#endif
+ {
+ int update = op->o_bd->be_update_ndn.bv_len;
+ char textbuf[SLAP_TEXT_BUFLEN];
+ size_t textlen = sizeof textbuf;
- if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && be->be_updatedn == NULL ) {
+ rs->sr_err = slap_mods_check( modlist, update, &rs->sr_text,
+ textbuf, textlen, NULL );
- add_created_attrs( op, e );
+ if( rs->sr_err != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
+ goto done;
}
- if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
- replog( be, LDAP_REQ_ADD, e->e_dn, e, 0 );
+
+ 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;
+ }
}
+ rs->sr_err = slap_mods2entry( modlist, &e, repl_user, 0,
+ &rs->sr_text, textbuf, textlen );
+ if( rs->sr_err != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
+ goto done;
+ }
+
+#ifdef LDAP_SLAPI
+ /*
+ * Call the preoperation plugin here, because the entry
+ * will actually contain something.
+ */
+ if ( op->o_pb ) {
+ 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 ( !repl_user )
+#endif
+ {
+ replog( op );
+ }
+ be_entry_release_w( op, e );
+ e = NULL;
+ }
+
+#ifndef SLAPD_MULTIMASTER
} else {
- entry_free( e );
- send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
- default_referral );
+ BerVarray defref = NULL;
+#ifdef LDAP_SLAPI
+ /*
+ * SLAPI_ADD_ENTRY will be empty, but this may be acceptable
+ * on replicas (for now, it involves the minimum code intrusion).
+ */
+ if ( op->o_pb ) {
+ rs->sr_err = doPreAddPluginFNs( op );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ /* plugin will have sent result */
+ goto done;
+ }
+ }
+#endif /* LDAP_SLAPI */
+
+ if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
+ syncinfo_t *si;
+ LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
+ struct berval tmpbv;
+ ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
+ ber_bvarray_add( &defref, &tmpbv );
+ }
+ } else {
+ defref = op->o_bd->be_update_refs
+ ? op->o_bd->be_update_refs : default_referral;
+ }
+
+ if ( defref != NULL ) {
+ rs->sr_ref = referral_rewrite( defref,
+ NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+ if ( rs->sr_ref == NULL ) rs->sr_ref = defref;
+ 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 );
+ } else {
+ send_ldap_error( op, rs,
+ LDAP_UNWILLING_TO_PERFORM,
+ "referral missing" );
+ }
+#endif /* SLAPD_MULTIMASTER */
}
} else {
- Debug( LDAP_DEBUG_ARGS, " do_add: HHH\n", 0, 0, 0 );
+#ifdef LDAP_SLAPI
+ if ( op->o_pb ) {
+ 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
+ if ( op->o_pb ) doPostAddPluginFNs( op );
+#endif /* LDAP_SLAPI */
+
+done:
+
+ slap_graduate_commit_csn( op );
+
+ if( modlist != NULL ) {
+ slap_mods_free( modlist );
+ }
+ if( e != NULL ) {
entry_free( e );
- send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
- "Function not implemented" );
}
+ op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+ op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+
+ return rs->sr_err;
+}
+
+int
+slap_mods2entry(
+ Modifications *mods,
+ Entry **e,
+ int repl_user,
+ int dup,
+ 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;
+
+ if ( !repl_user ) {
+ assert( mods->sml_op == LDAP_MOD_ADD );
+ }
+ assert( mods->sml_desc != NULL );
+
+ attr = attr_find( (*e)->e_attrs, mods->sml_desc );
+
+ if( attr != NULL ) {
+#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;
+
+ 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;
+ }
+
+ 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 = LDAP_SUCCESS;
+ int match;
+
+ for ( i = 0; mods->sml_values[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
+ ? &mods->sml_nvalues[i]
+ : &mods->sml_values[i],
+ mods->sml_nvalues
+ ? &mods->sml_nvalues[j]
+ : &mods->sml_values[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;
+ }
+ }
+ }
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+ }
+ }
+
+ attr = ch_calloc( 1, sizeof(Attribute) );
+
+ /* move ad to attr structure */
+ attr->a_desc = mods->sml_desc;
+ if ( !dup )
+ mods->sml_desc = NULL;
+
+ /* move values to attr structure */
+ /* should check for duplicates */
+ if ( dup ) {
+ int i;
+ for ( i = 0; mods->sml_values[i].bv_val; i++ ) ;
+ attr->a_vals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
+ for ( i = 0; mods->sml_values[i].bv_val; i++ )
+ ber_dupbv( &attr->a_vals[i], &mods->sml_values[i] );
+ attr->a_vals[i].bv_len = 0;
+ attr->a_vals[i].bv_val = NULL;
+ } else {
+ attr->a_vals = mods->sml_values;
+ mods->sml_values = NULL;
+ }
+
+ if ( mods->sml_nvalues ) {
+ if ( dup ) {
+ int i;
+ for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) ;
+ attr->a_nvals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
+ for ( i = 0; mods->sml_nvalues[i].bv_val; i++ )
+ ber_dupbv( &attr->a_nvals[i], &mods->sml_nvalues[i] );
+ attr->a_nvals[i].bv_len = 0;
+ attr->a_nvals[i].bv_val = NULL;
+ } else {
+ attr->a_nvals = mods->sml_nvalues;
+ mods->sml_nvalues = NULL;
+ }
+ } else {
+ attr->a_nvals = attr->a_vals;
+ }
+
+ *tail = attr;
+ tail = &attr->a_next;
+ }
+
+ return LDAP_SUCCESS;
}
-static void
-add_created_attrs( Operation *op, Entry *e )
+int
+slap_entry2mods(
+ Entry *e,
+ Modifications **mods,
+ const char **text,
+ char *textbuf, size_t textlen )
{
- char buf[22];
- struct berval bv;
- struct berval *bvals[2];
- Attribute **a, **next;
- Attribute *tmp;
- struct tm *ltm;
-
- Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 );
-
- bvals[0] = &bv;
- bvals[1] = NULL;
-
- /* remove any attempts by the user to add these attrs */
- for ( a = &e->e_attrs; *a != NULL; a = next ) {
- if ( strcasecmp( (*a)->a_type, "modifiersname" ) == 0 ||
- strcasecmp( (*a)->a_type, "modifytimestamp" ) == 0 ||
- strcasecmp( (*a)->a_type, "creatorsname" ) == 0 ||
- strcasecmp( (*a)->a_type, "createtimestamp" ) == 0 ) {
- tmp = *a;
- *a = (*a)->a_next;
- attr_free( tmp );
- next = a;
+ Modifications *modhead = NULL;
+ Modifications *mod;
+ Modifications **modtail = &modhead;
+ Attribute *a_new;
+ AttributeDescription *a_new_desc;
+ int i, count;
+
+ a_new = e->e_attrs;
+
+ while ( a_new != NULL ) {
+ a_new_desc = a_new->a_desc;
+ mod = (Modifications *) malloc( sizeof( Modifications ));
+
+ mod->sml_op = LDAP_MOD_REPLACE;
+
+ mod->sml_type = a_new_desc->ad_cname;
+
+ for ( count = 0; a_new->a_vals[count].bv_val; count++ );
+
+ mod->sml_bvalues = (struct berval*) malloc(
+ (count+1) * sizeof( struct berval) );
+
+ /* see slap_mods_check() comments...
+ * if a_vals == a_nvals, there is no normalizer.
+ * in this case, mod->sml_nvalues must be left NULL.
+ */
+ if ( a_new->a_vals != a_new->a_nvals ) {
+ mod->sml_nvalues = (struct berval*) malloc(
+ (count+1) * sizeof( struct berval) );
} else {
- next = &(*a)->a_next;
+ mod->sml_nvalues = NULL;
+ }
+
+ for ( i = 0; i < count; i++ ) {
+ ber_dupbv(mod->sml_bvalues+i, a_new->a_vals+i);
+ if ( mod->sml_nvalues ) {
+ ber_dupbv( mod->sml_nvalues+i, a_new->a_vals+i );
+ }
}
+
+ mod->sml_bvalues[count].bv_val = 0;
+ mod->sml_bvalues[count].bv_len = 0;
+
+ if ( mod->sml_nvalues ) {
+ mod->sml_nvalues[count].bv_val = 0;
+ mod->sml_nvalues[count].bv_len = 0;
+ }
+
+ mod->sml_desc = a_new_desc;
+ mod->sml_next =NULL;
+ *modtail = mod;
+ modtail = &mod->sml_next;
+ a_new = a_new->a_next;
}
- if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- bv.bv_val = "NULLDN";
- bv.bv_len = strlen( bv.bv_val );
+ *mods = modhead;
+
+ return LDAP_SUCCESS;
+}
+
+#ifdef LDAP_SLAPI
+static void initAddPlugin( Operation *op,
+ struct berval *dn, Entry *e, int manageDSAit )
+{
+ 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
+ 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_SUCCESS ) {
+ rc = LDAP_OTHER;
+ }
+#endif
} else {
- bv.bv_val = op->o_dn;
- bv.bv_len = strlen( bv.bv_val );
+ rc = LDAP_SUCCESS;
}
- attr_merge( e, "creatorsname", bvals );
- pthread_mutex_lock( ¤ttime_mutex );
- ltm = localtime( ¤ttime );
-#ifdef LDAP_Y2K
- strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
+ return rc;
+}
+
+static void doPostAddPluginFNs( Operation *op )
+{
+ int rc;
+
+ 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
- strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+ Debug(LDAP_DEBUG_TRACE, "do_add: add postoperation plugin failed.\n",
+ 0, 0, 0);
#endif
- pthread_mutex_unlock( ¤ttime_mutex );
-
- bv.bv_val = buf;
- bv.bv_len = strlen( bv.bv_val );
- attr_merge( e, "createtimestamp", bvals );
+ }
}
+#endif /* LDAP_SLAPI */