+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
/*
* Copyright (c) 1995 Regents of the University of Michigan.
* All rights reserved.
#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"
-static int add_created_attrs(Operation *op, Entry *e);
+static int slap_mods2entry(
+ Modifications *mods,
+ Entry **e,
+ const char **text );
int
do_add( Connection *conn, Operation *op )
{
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;
+ 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 ));
+#else
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
-
- if( op->o_bind_in_progress ) {
- Debug( LDAP_DEBUG_ANY, "do_add: SASL bind in progress.\n", 0, 0, 0 );
- send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
- "SASL bind in progress", NULL, NULL );
- return LDAP_SASL_BIND_IN_PROGRESS;
- }
-
+#endif
/*
* Parse the add request. It looks like this:
*
*/
/* get the name */
- if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
+ if ( ber_scanf( ber, "{o", /*}*/ &dn ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
return -1;
}
- ndn = ch_strdup( dn );
-
- if ( dn_normalize_case( 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;
- }
-
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
-
- e->e_dn = dn;
- e->e_ndn = ndn;
+ 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;
- dn = NULL;
+ rc = dnPrettyNormal( NULL, &dn, &e->e_name, &e->e_nname );
- Debug( LDAP_DEBUG_ARGS, " do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
+ 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;
+ }
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+ "do_add: conn %d dn (%s)\n", conn->c_connid, e->e_dn ));
+#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;
+ tag = ber_next_element( ber, &len, last ) )
+ {
+ Modifications *mod;
- if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) {
+ rc = ber_scanf( ber, "{o{W}}", &tmp.sml_type, &tmp.sml_bvalues );
+
+ if ( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_add: conn %d decoding error \n", conn->c_connid ));
+#else
+ Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
- entry_free( e );
- return -1;
+ rc = -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, "no values for type", NULL, NULL );
- free( type );
- entry_free( e );
- return LDAP_PROTOCOL_ERROR;
+ if ( tmp.sml_bvalues == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_add: conn %d no values for type %s\n",
+ conn->c_connid, tmp.sml_type.bv_val ));
+#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;
}
-
- attr_merge( e, type, vals );
-
- free( type );
- ber_bvecfree( 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_bvalues = tmp.sml_bvalues;
+
+ *modtail = mod;
+ modtail = &mod->sml_next;
}
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
- entry_free( e );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
- return -1;
+ rc = -1;
+ goto done;
}
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
- entry_free( e );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_add: conn %d get_ctrls failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
- return rc;
+#endif
+ goto done;
}
- Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n",
- op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
+ if ( modlist == NULL ) {
+ send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+ NULL, "no attributes provided", NULL, NULL );
+ goto done;
+ }
+
+ Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
+ op->o_connid, op->o_opid, e->e_dn, 0, 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",
+ NULL, NULL );
+ goto done;
+
+#if defined( SLAPD_SCHEMA_DN )
+ } else if ( strcasecmp( e->e_ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+ send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
+ NULL, "subschema subentry already exists",
+ NULL, NULL );
+ goto done;
+#endif
+ }
+
+ 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 );
+ be = select_backend( &e->e_nname, manageDSAit, 0 );
if ( be == NULL ) {
- entry_free( e );
- send_ldap_result( conn, op, LDAP_REFERRAL, NULL,
- NULL, default_referral, NULL );
- return rc;
+ BVarray 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 );
+
+ if ( ref ) bvarray_free( ref );
+ goto done;
+ }
+
+ /* check restrictions */
+ rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL );
+ goto done;
+ }
+
+ /* check for referrals */
+ rc = backend_check_referrals( be, conn, op, &e->e_name, &e->e_nname );
+ if ( rc != LDAP_SUCCESS ) {
+ goto done;
}
/*
*/
if ( be->be_add ) {
/* do the update here */
- if ( be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+ int repl_user = be_isupdate(be, &op->o_ndn );
+#ifndef SLAPD_MULTIMASTER
+ if ( !be->be_update_ndn.bv_len || repl_user )
+#endif
{
+ int update = be->be_update_ndn.bv_len;
+ char textbuf[SLAP_TEXT_BUFLEN];
+ size_t textlen = sizeof textbuf;
+
+ rc = slap_mods_check( modlist, update, &text,
+ textbuf, textlen );
+
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL );
+ goto done;
+ }
+
if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && be->be_update_ndn == NULL )
+ global_lastmod == ON)) && !repl_user )
{
- rc = add_created_attrs( op, e );
-
+ 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,
+ textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
- entry_free( e );
send_ldap_result( conn, op, rc,
- NULL, "no-user-modification attribute type",
- NULL, NULL );
- return rc;
+ NULL, text, NULL, NULL );
+ goto done;
}
}
+ rc = slap_mods2entry( modlist, &e, &text );
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL );
+ goto done;
+ }
+
if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
- replog( be, op, e->e_dn, e );
- be_entry_release_w( be, e );
+#ifdef SLAPD_MULTIMASTER
+ if ( !repl_user )
+#endif
+ {
+ replog( be, op, &e->e_name, &e->e_nname, e );
+ }
+ be_entry_release_w( be, conn, op, e );
+ e = NULL;
}
+#ifndef SLAPD_MULTIMASTER
} else {
- entry_free( e );
+ BVarray defref = be->be_update_refs
+ ? be->be_update_refs : default_referral;
+ BVarray ref = referral_rewrite( defref,
+ NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+
send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
- be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+ ref ? ref : defref, NULL );
+
+ if ( ref ) bvarray_free( ref );
+#endif
}
} else {
- Debug( LDAP_DEBUG_ARGS, " do_add: HHH\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_add: conn %d no backend support\n", conn->c_connid ));
+#else
+ Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
+#endif
+ send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+ NULL, "operation not supported within namingContext", NULL, NULL );
+ }
+
+done:
+ free( dn.bv_val );
+
+ if( modlist != NULL ) {
+ slap_mods_free( modlist );
+ }
+ if( e != NULL ) {
entry_free( e );
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "Function not implemented", NULL, NULL );
}
return rc;
}
-static int
-add_created_attrs( Operation *op, Entry *e )
+static int slap_mods2entry(
+ Modifications *mods,
+ Entry **e,
+ const char **text )
{
- 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 ) {
- if ( oc_check_no_usermod_attr( a->a_type ) ) {
- return LDAP_CONSTRAINT_VIOLATION;
- }
- }
+ Attribute **tail = &(*e)->e_attrs;
+ assert( *tail == NULL );
- if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- bv.bv_val = "<anonymous>";
- bv.bv_len = strlen( bv.bv_val );
- } else {
- bv.bv_val = op->o_dn;
- bv.bv_len = strlen( bv.bv_val );
- }
- attr_merge( e, "creatorsname", bvals );
+ 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 ) {
+#define SLURPD_FRIENDLY
+#ifdef SLURPD_FRIENDLY
+ ber_len_t i,j;
- currenttime = slap_get_time();
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#ifndef LDAP_LOCALTIME
- ltm = gmtime( ¤ttime );
- strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
+ for( i=0; attr->a_vals[i].bv_val; i++ ) {
+ /* count them */
+ }
+ 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) );
+
+ /* should check for duplicates */
+ AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
+ sizeof( struct berval ) * j );
+
+ /* trim the mods array */
+ ch_free( mods->sml_bvalues );
+ mods->sml_bvalues = NULL;
+
+ continue;
#else
- ltm = localtime( ¤ttime );
- strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+ *text = "attribute provided more than once";
+ return LDAP_TYPE_OR_VALUE_EXISTS;
#endif
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+ }
+
+ attr = ch_calloc( 1, sizeof(Attribute) );
+
+ /* move ad to attr structure */
+ attr->a_desc = mods->sml_desc;
+ mods->sml_desc = NULL;
- bv.bv_val = buf;
- bv.bv_len = strlen( bv.bv_val );
- attr_merge( e, "createtimestamp", bvals );
+ /* move values to attr structure */
+ /* should check for duplicates */
+ attr->a_vals = mods->sml_bvalues;
+ mods->sml_bvalues = NULL;
+
+ *tail = attr;
+ tail = &attr->a_next;
+ }
return LDAP_SUCCESS;
}
projects / openldap / blobdiff