X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=db9b809752342a1baf28f6fe5afdf6c8dadb1d6d;hb=b73915d36f568d349061f60d27fbcc102ecf374a;hp=552a0e62455d1ab4623bc269b798de401fe236b8;hpb=d170fae411f89a27eabd80398d3fb63ac283ebeb;p=openldap diff --git a/servers/slapd/add.c b/servers/slapd/add.c index 552a0e6245..db9b809752 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2005 The OpenLDAP Foundation. + * Copyright 1998-2007 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,7 @@ do_add( Operation *op, SlapReply *rs ) return SLAPD_DISCONNECT; } - op->ora_e = (Entry *) ch_calloc( 1, sizeof(Entry) ); + op->ora_e = entry_alloc(); rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx ); @@ -157,7 +157,7 @@ do_add( Operation *op, SlapReply *rs ) goto done; } - rs->sr_err = slap_mods_check( modlist, &rs->sr_text, + rs->sr_err = slap_mods_check( op, modlist, &rs->sr_text, textbuf, textlen, NULL ); if ( rs->sr_err != LDAP_SUCCESS ) { @@ -180,6 +180,13 @@ do_add( Operation *op, SlapReply *rs ) op->o_bd = frontendDB; rc = frontendDB->be_add( op, rs ); + +#ifdef LDAP_X_TXN + if ( rc == LDAP_X_TXN_SPECIFY_OKAY ) { + /* skip cleanup */ + return rc; + } else +#endif if ( rc == 0 ) { if ( op->ora_e != NULL && op->o_private != NULL ) { BackendDB *bd = op->o_bd; @@ -214,10 +221,9 @@ int fe_op_add( Operation *op, SlapReply *rs ) { int manageDSAit; - Modifications *modlist = op->ora_modlist; - Modifications **modtail = &modlist; + Modifications **modtail = &op->ora_modlist; int rc = 0; - BackendDB *op_be; + BackendDB *op_be, *bd = op->o_bd; char textbuf[ SLAP_TEXT_BUFLEN ]; size_t textlen = sizeof( textbuf ); @@ -230,23 +236,20 @@ fe_op_add( Operation *op, SlapReply *rs ) */ op->o_bd = select_backend( &op->ora_e->e_nname, manageDSAit, 1 ); if ( op->o_bd == NULL ) { + op->o_bd = bd; rs->sr_ref = referral_rewrite( default_referral, NULL, &op->ora_e->e_name, LDAP_SCOPE_DEFAULT ); if ( !rs->sr_ref ) rs->sr_ref = default_referral; if ( rs->sr_ref ) { rs->sr_err = LDAP_REFERRAL; - op->o_bd = frontendDB; send_ldap_result( op, rs ); - op->o_bd = NULL; if ( rs->sr_ref != default_referral ) { ber_bvarray_free( rs->sr_ref ); } } else { - op->o_bd = frontendDB; send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, "no global superior knowledge" ); - op->o_bd = NULL; } goto done; } @@ -268,7 +271,7 @@ fe_op_add( Operation *op, SlapReply *rs ) goto done; } - rs->sr_err = slap_mods_obsolete_check( op, modlist, + rs->sr_err = slap_mods_obsolete_check( op, op->ora_modlist, &rs->sr_text, textbuf, textlen ); if ( rs->sr_err != LDAP_SUCCESS ) { @@ -285,17 +288,14 @@ fe_op_add( Operation *op, SlapReply *rs ) if ( op->o_bd->be_add ) { /* do the update here */ int repl_user = be_isupdate( op ); -#ifndef SLAPD_MULTIMASTER - if ( !SLAP_SHADOW(op->o_bd) || repl_user ) -#endif - { + if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user ) { int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn ); slap_callback cb = { NULL, slap_replog_cb, NULL, NULL }; op->o_bd = op_be; if ( !update ) { - rs->sr_err = slap_mods_no_user_mod_check( op, modlist, + rs->sr_err = slap_mods_no_user_mod_check( op, op->ora_modlist, &rs->sr_text, textbuf, textlen ); if ( rs->sr_err != LDAP_SUCCESS ) { @@ -306,7 +306,7 @@ fe_op_add( Operation *op, SlapReply *rs ) if ( !repl_user ) { /* go to the last mod */ - for ( modtail = &modlist; + for ( modtail = &op->ora_modlist; *modtail != NULL; modtail = &(*modtail)->sml_next ) { @@ -315,29 +315,18 @@ fe_op_add( Operation *op, SlapReply *rs ) } - /* check for duplicate values */ + /* check for unmodifiable attributes */ rs->sr_err = slap_mods_no_repl_user_mod_check( op, - modlist, &rs->sr_text, textbuf, textlen ); - if ( rs->sr_err != LDAP_SUCCESS ) { - send_ldap_result( op, rs ); - goto done; - } - - rs->sr_err = slap_mods2entry( *modtail, &op->ora_e, - 0, 0, &rs->sr_text, textbuf, textlen ); + op->ora_modlist, &rs->sr_text, textbuf, textlen ); if ( rs->sr_err != LDAP_SUCCESS ) { send_ldap_result( op, rs ); goto done; } - } -#ifdef SLAPD_MULTIMASTER - if ( !repl_user ) -#endif - { cb.sc_next = op->o_callback; op->o_callback = &cb; } + rc = op->o_bd->be_add( op, rs ); if ( rc == LDAP_SUCCESS ) { /* NOTE: be_entry_release_w() is @@ -347,7 +336,6 @@ fe_op_add( Operation *op, SlapReply *rs ) op->o_private = op->o_bd; } -#ifndef SLAPD_MULTIMASTER } else { BerVarray defref = NULL; @@ -370,15 +358,15 @@ fe_op_add( Operation *op, SlapReply *rs ) LDAP_UNWILLING_TO_PERFORM, "shadow context; no update referral" ); } -#endif /* SLAPD_MULTIMASTER */ } } else { - Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 ); - send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + Debug( LDAP_DEBUG_ARGS, "do_add: no backend support\n", 0, 0, 0 ); + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, "operation not supported within namingContext" ); } done:; + op->o_bd = bd; return rc; } @@ -436,7 +424,7 @@ slap_mods2entry( attr->a_vals = ch_realloc( attr->a_vals, sizeof( struct berval ) * (i+j) ); - /* should check for duplicates */ + /* checked for duplicates in slap_mods_check */ if ( dup ) { for ( j = 0; mods->sml_values[j].bv_val; j++ ) { @@ -470,52 +458,14 @@ slap_mods2entry( snprintf( textbuf, textlen, "attribute '%s' provided more than once", mods->sml_desc->ad_cname.bv_val ); + *text = textbuf; return LDAP_TYPE_OR_VALUE_EXISTS; #endif } - if( mods->sml_values[1].bv_val != NULL ) { - /* check for duplicates */ - int i, j, rc, match; - MatchingRule *mr = mods->sml_desc->ad_type->sat_equality; - - for ( i = 1; mods->sml_values[i].bv_val != NULL; i++ ) { - /* test asserted values against themselves */ - for( j = 0; j < i; j++ ) { - rc = ordered_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; - - } else if ( rc != LDAP_SUCCESS ) { - return rc; - } - } - } - } - - attr = ch_calloc( 1, sizeof(Attribute) ); - - /* move ad to attr structure */ - attr->a_desc = mods->sml_desc; + attr = attr_alloc( mods->sml_desc ); /* move values to attr structure */ - /* should check for duplicates */ if ( dup ) { int i; for ( i = 0; mods->sml_values[i].bv_val; i++ ) /* EMPTY */; @@ -634,42 +584,34 @@ int slap_add_opattrs( char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ]; Attribute *a; - a = attr_find( op->ora_e->e_attrs, - slap_schema.si_ad_structuralObjectClass ); - - if ( !a ) { - Attribute *oc; - int rc; - - oc = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_objectClass ); - if ( oc ) { - rc = structural_class( oc->a_vals, &tmp, NULL, text, - textbuf, textlen ); - if( rc != LDAP_SUCCESS ) return rc; - - attr_merge_one( op->ora_e, slap_schema.si_ad_structuralObjectClass, - &tmp, NULL ); - } - } - if ( SLAP_LASTMOD( op->o_bd ) ) { char *ptr; + int gotcsn = 0; + timestamp.bv_val = timebuf; + a = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_entryCSN ); + if ( a ) { + gotcsn = 1; + csn = a->a_vals[0]; + } if ( BER_BVISEMPTY( &op->o_csn )) { - if ( SLAP_SHADOW( op->o_bd )) - manage_ctxcsn = 0; - csn.bv_val = csnbuf; - csn.bv_len = sizeof(csnbuf); - slap_get_csn( op, &csn, manage_ctxcsn ); + if ( !gotcsn ) { + csn.bv_val = csnbuf; + csn.bv_len = sizeof(csnbuf); + slap_get_csn( op, &csn, manage_ctxcsn ); + } else { + if ( manage_ctxcsn ) + slap_queue_csn( op, &csn ); + } } else { csn = op->o_csn; } - ptr = strchr( csn.bv_val, '#' ); + ptr = ber_bvchr( &csn, '#' ); if ( ptr ) { timestamp.bv_len = ptr - csn.bv_val; - if ( timestamp.bv_len >= sizeof(timebuf) ) + if ( timestamp.bv_len >= sizeof(timebuf) ) /* ?!? */ timestamp.bv_len = sizeof(timebuf) - 1; - strncpy( timebuf, csn.bv_val, timestamp.bv_len ); + AC_MEMCPY( timebuf, csn.bv_val, timestamp.bv_len ); timebuf[timestamp.bv_len] = '\0'; } else { time_t now = slap_get_time(); @@ -713,9 +655,7 @@ int slap_add_opattrs( slap_schema.si_ad_createTimestamp, ×tamp, NULL ); } - a = attr_find( op->ora_e->e_attrs, - slap_schema.si_ad_entryCSN ); - if ( !a ) { + if ( !gotcsn ) { attr_merge_one( op->ora_e, slap_schema.si_ad_entryCSN, &csn, NULL ); } @@ -733,7 +673,7 @@ int slap_add_opattrs( attr_merge_one( op->ora_e, slap_schema.si_ad_modifyTimestamp, ×tamp, NULL ); } - } + return LDAP_SUCCESS; }