X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=e45ded2ae6a9dd06483bc095b39a54bf3c952399;hb=517fa54bb0f764968ca56e7931a09adac4f33af6;hp=930608c763e50ef96181e89d39b068f78bb45125;hpb=7a0b0b2bbf7777cf009ab746654d67ea0abef6ee;p=openldap diff --git a/servers/slapd/add.c b/servers/slapd/add.c index 930608c763..e45ded2ae6 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* @@ -18,14 +18,17 @@ #include "portable.h" #include - #include #include #include +#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 ) @@ -36,17 +39,14 @@ do_add( Connection *conn, Operation *op ) ber_tag_t tag; Entry *e; Backend *be; + LDAPModList *modlist = NULL; + LDAPModList **modtail = &modlist; + Modifications *mods = NULL; + const char *text; int rc = LDAP_SUCCESS; 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; - } - /* * Parse the add request. It looks like this: * @@ -82,54 +82,63 @@ do_add( Connection *conn, Operation *op ) e->e_dn = dn; e->e_ndn = ndn; + e->e_attrs = NULL; e->e_private = NULL; - Debug( LDAP_DEBUG_ARGS, " do_add: ndn (%s)\n", e->e_ndn, 0, 0 ); + Debug( LDAP_DEBUG_ARGS, "do_add: ndn (%s)\n", e->e_ndn, 0, 0 ); /* 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 ) ) + { + LDAPModList *mod = (LDAPModList *) ch_malloc( sizeof(LDAPModList) ); + mod->ml_op = LDAP_MOD_ADD; + mod->ml_next = NULL; + + rc = ber_scanf( ber, "{a{V}}", &mod->ml_type, &mod->ml_bvalues ); - if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) { + if ( rc == LBER_ERROR ) { + Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 ); send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); - entry_free( e ); - return -1; + rc = -1; + free( mod ); + 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 ( mod->ml_bvalues == NULL ) { + 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 attribute type", NULL, NULL ); + free( mod->ml_type ); + free( mod ); + goto done; } - attr_merge( e, type, vals ); - - free( type ); - ber_bvecfree( vals ); + *modtail = mod; + modtail = &mod->ml_next; } if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) { - entry_free( e ); Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 ); 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 ); Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 ); - return rc; + goto done; } + 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_ndn, 0, 0 ); @@ -140,19 +149,31 @@ do_add( Connection *conn, Operation *op ) */ be = select_backend( e->e_ndn ); if ( be == NULL ) { - entry_free( e ); - send_ldap_result( conn, op, LDAP_REFERRAL, NULL, - NULL, default_referral, NULL ); - return rc; + send_ldap_result( conn, op, rc = LDAP_REFERRAL, + NULL, NULL, default_referral, NULL ); + 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 ); + goto done; + } + + /* check for referrals */ + rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn ); + if ( rc != LDAP_SUCCESS ) { + goto done; } if ( global_readonly || be->be_readonly ) { Debug( LDAP_DEBUG_ANY, "do_add: database is read-only\n", 0, 0, 0 ); - entry_free( e ); - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, - NULL, "database is read-only", NULL, NULL ); - return LDAP_UNWILLING_TO_PERFORM; + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "directory is read-only", NULL, NULL ); + goto done; } /* @@ -172,22 +193,43 @@ do_add( Connection *conn, Operation *op ) strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) #endif { + int update = be->be_update_ndn != NULL; + + rc = slap_modlist2mods( modlist, update, &mods, &text ); + if( rc != LDAP_SUCCESS ) { + send_ldap_result( conn, op, rc, + NULL, text, NULL, NULL ); + goto done; + } + #ifndef SLAPD_MULTIMASTER if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED && - global_lastmod == ON)) && be->be_update_ndn == NULL ) + global_lastmod == ON)) && !update ) #endif { - rc = add_created_attrs( op, e ); - + Modifications **modstail; + for( modstail = &mods; + *modstail != NULL; + modstail = &(*modstail)->sml_next ) + { + assert( (*modstail)->sml_op == LDAP_MOD_ADD ); + assert( (*modstail)->sml_desc != NULL ); + } + rc = slap_mods_opattrs( op, modstail, &text ); 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( mods, &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 ) { #ifdef SLAPD_MULTIMASTER if (be->be_update_ndn == NULL || @@ -197,70 +239,97 @@ do_add( Connection *conn, Operation *op ) replog( be, op, e->e_dn, e ); } be_entry_release_w( be, e ); + e = NULL; } #ifndef SLAPD_MULTIMASTER } else { - entry_free( e ); send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, be->be_update_refs ? be->be_update_refs : default_referral, NULL ); #endif } } else { - Debug( LDAP_DEBUG_ARGS, " do_add: HHH\n", 0, 0, 0 ); - entry_free( e ); + Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 ); send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "Function not implemented", NULL, NULL ); + NULL, "operation not supported within namingContext", NULL, NULL ); + } + +done: + if( modlist != NULL ) { + slap_modlist_free( modlist ); + } + if( mods != NULL ) { + slap_mods_free( mods ); + } + if( e != NULL ) { + entry_free( e ); } 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 = ""; - 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 ); - 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 ); + if( attr != NULL ) { +#define SLURPD_FRIENDLY +#ifdef SLURPD_FRIENDLY + ber_len_t i,j; + + for( i=0; attr->a_vals[i]; i++ ) { + /* count them */ + } + for( j=0; mods->sml_bvalues[j]; j++ ) { + /* count them */ + } + j++; /* NULL */ + + attr->a_vals = ch_realloc( attr->a_vals, + sizeof( struct berval * ) * (i+j) ); + + /* should check for duplicates */ + 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; } +