X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=8944b2297f27f9741cf1e54d0c87fee43a7dc742;hb=426ca14a868b6edb638b48e14593542a365fcc4b;hp=f6dbac13fe11fe0fcc92ab65c15425ae9d094850;hpb=8ab0c4d40130f916feb5a1566e757be6de7deff0;p=openldap diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index f6dbac13fe..8944b2297f 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -16,7 +16,6 @@ */ #include "portable.h" -#include "slapi_common.h" #include @@ -24,42 +23,33 @@ #include #include -#include "lutil.h" - #include "ldap_pvt.h" #include "slap.h" +#ifdef LDAP_SLAPI #include "slapi.h" +#endif +#include "lutil.h" -#ifdef LDAP_SLAPI -static LDAPMod **Modifications2LDAPMods (Modifications **modlist); -static Modifications *LDAPMods2Modifications (LDAPMod **mods); -static void FreeLDAPMods (LDAPMod **mods); -#endif /* LDAP_SLAPI */ int do_modify( - Connection *conn, - Operation *op ) + Operation *op, + SlapReply *rs ) { struct berval dn = { 0, NULL }; - struct berval pdn = { 0, NULL }; - struct berval ndn = { 0, NULL }; char *last; ber_tag_t tag; ber_len_t len; Modifications *modlist = NULL; Modifications **modtail = &modlist; -#ifdef LDAP_SLAPI - LDAPMod **modv = NULL; -#endif #ifdef LDAP_DEBUG Modifications *tmp; #endif - Backend *be; - int rc; - const char *text; - int manageDSAit; +#ifdef LDAP_SLAPI + LDAPMod **modv = NULL; Slapi_PBlock *pb = op->o_pb; +#endif + int manageDSAit; #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ENTRY, "do_modify: enter\n", 0, 0, 0 ); @@ -93,8 +83,7 @@ do_modify( Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 ); #endif - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding error" ); + send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" ); return SLAPD_DISCONNECT; } @@ -114,28 +103,29 @@ do_modify( ber_int_t mop; Modifications tmp, *mod; + tmp.sml_nvalues = NULL; if ( ber_scanf( op->o_ber, "{i{m[W]}}", &mop, - &tmp.sml_type, &tmp.sml_bvalues ) + &tmp.sml_type, &tmp.sml_values ) == LBER_ERROR ) { - send_ldap_disconnect( conn, op, - LDAP_PROTOCOL_ERROR, "decoding modlist error" ); - rc = SLAPD_DISCONNECT; + send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding modlist error" ); + rs->sr_err = SLAPD_DISCONNECT; goto cleanup; } mod = (Modifications *) ch_malloc( sizeof(Modifications) ); mod->sml_op = mop; mod->sml_type = tmp.sml_type; - mod->sml_bvalues = tmp.sml_bvalues; + mod->sml_values = tmp.sml_values; + mod->sml_nvalues = NULL; mod->sml_desc = NULL; mod->sml_next = NULL; *modtail = mod; switch( mop ) { case LDAP_MOD_ADD: - if ( mod->sml_bvalues == NULL ) { + if ( mod->sml_values == NULL ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ERR, "do_modify: modify/add operation (%ld) requires values\n", @@ -146,10 +136,8 @@ do_modify( (long) mop, 0, 0 ); #endif - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, - NULL, "modify/add operation requires values", - NULL, NULL ); - rc = LDAP_PROTOCOL_ERROR; + send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, + "modify/add operation requires values" ); goto cleanup; } @@ -169,9 +157,8 @@ do_modify( (long) mop, 0, 0 ); #endif - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, - NULL, "unrecognized modify operation", NULL, NULL ); - rc = LDAP_PROTOCOL_ERROR; + send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, + "unrecognized modify operation" ); goto cleanup; } } @@ -180,7 +167,7 @@ do_modify( } *modtail = NULL; - if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { + if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ERR, "do_modify: get_ctrls failed\n", 0, 0, 0 ); #else @@ -190,21 +177,20 @@ do_modify( goto cleanup; } - rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn ); - if( rc != LDAP_SUCCESS ) { + rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn ); + if( rs->sr_err != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, INFO, "do_modify: conn %d invalid dn (%s)\n", - conn->c_connid, dn.bv_val, 0 ); + op->o_connid, dn.bv_val, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_modify: 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 ); + send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" ); goto cleanup; } - if( ndn.bv_len == 0 ) { + if( op->o_req_ndn.bv_len == 0 ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ERR, "do_modify: attempt to modify root DSE.\n",0, 0, 0 ); @@ -212,11 +198,11 @@ do_modify( Debug( LDAP_DEBUG_ANY, "do_modify: root dse!\n", 0, 0, 0 ); #endif - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "modify upon the root DSE not supported", NULL, NULL ); + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "modify upon the root DSE not supported" ); goto cleanup; - } else if ( bvmatch( &ndn, &global_schemandn ) ) { + } else if ( bvmatch( &op->o_req_ndn, &global_schemandn ) ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ERR, "do_modify: attempt to modify subschema subentry.\n" , 0, 0, 0 ); @@ -224,9 +210,8 @@ do_modify( Debug( LDAP_DEBUG_ANY, "do_modify: subschema subentry!\n", 0, 0, 0 ); #endif - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "modification of subschema subentry not supported", - NULL, NULL ); + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "modification of subschema subentry not supported" ); goto cleanup; } @@ -244,11 +229,11 @@ do_modify( "add" : (tmp->sml_op == LDAP_MOD_DELETE ? "delete" : "replace"), tmp->sml_type.bv_val, 0 ); - if ( tmp->sml_bvalues == NULL ) { + if ( tmp->sml_values == NULL ) { LDAP_LOG( OPERATION, DETAIL1, "\t\tno values", 0, 0, 0 ); - } else if ( tmp->sml_bvalues[0].bv_val == NULL ) { + } else if ( tmp->sml_values[0].bv_val == NULL ) { LDAP_LOG( OPERATION, DETAIL1, "\t\tzero values", 0, 0, 0 ); - } else if ( tmp->sml_bvalues[1].bv_val == NULL ) { + } else if ( tmp->sml_values[1].bv_val == NULL ) { LDAP_LOG( OPERATION, DETAIL1, "\t\tone value", 0, 0, 0 ); } else { LDAP_LOG( OPERATION, DETAIL1, "\t\tmultiple values", 0, 0, 0 ); @@ -260,22 +245,21 @@ do_modify( ? "add" : (tmp->sml_op == LDAP_MOD_DELETE ? "delete" : "replace"), tmp->sml_type.bv_val, 0 ); - if ( tmp->sml_bvalues == NULL ) { + if ( tmp->sml_values == NULL ) { Debug( LDAP_DEBUG_ARGS, "%s\n", "\t\tno values", NULL, NULL ); - } else if ( tmp->sml_bvalues[0].bv_val == NULL ) { + } else if ( tmp->sml_values[0].bv_val == NULL ) { Debug( LDAP_DEBUG_ARGS, "%s\n", "\t\tzero values", NULL, NULL ); - } else if ( tmp->sml_bvalues[1].bv_val == NULL ) { + } else if ( tmp->sml_values[1].bv_val == NULL ) { Debug( LDAP_DEBUG_ARGS, "%s, length %ld\n", - "\t\tone value", (long) tmp->sml_bvalues[0].bv_len, NULL ); + "\t\tone value", (long) tmp->sml_values[0].bv_len, NULL ); } else { Debug( LDAP_DEBUG_ARGS, "%s\n", "\t\tmultiple values", NULL, NULL ); } #endif } -#endif if ( StatslogTest( LDAP_DEBUG_STATS ) ) { char abuf[BUFSIZ/2], *ptr = abuf; @@ -303,6 +287,7 @@ do_modify( op->o_connid, op->o_opid, abuf, 0, 0 ); } } +#endif /* LDAP_DEBUG */ manageDSAit = get_manageDSAit( op ); @@ -311,45 +296,38 @@ do_modify( * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) { - BerVarray ref = referral_rewrite( default_referral, - NULL, &pdn, LDAP_SCOPE_DEFAULT ); + if ( (op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 )) == NULL ) { + rs->sr_ref = referral_rewrite( default_referral, + NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); + if (!rs->sr_ref) rs->sr_ref = default_referral; - send_ldap_result( conn, op, rc = LDAP_REFERRAL, - NULL, NULL, ref ? ref : default_referral, NULL ); + rs->sr_err = LDAP_REFERRAL; + send_ldap_result( op, rs ); - ber_bvarray_free( ref ); + if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref ); goto cleanup; } /* 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 ); + if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); goto cleanup; } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, &pdn, &ndn ); - if ( rc != LDAP_SUCCESS ) { + if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) { goto cleanup; } - /* deref suffix alias if appropriate */ - suffix_alias( be, &ndn ); - #if defined( LDAP_SLAPI ) - slapi_x_backend_set_pb( pb, be ); - slapi_x_connection_set_pb( pb, conn ); - slapi_x_operation_set_pb( pb, op ); + slapi_x_pblock_set_operation( pb, op ); slapi_pblock_set( pb, SLAPI_MODIFY_TARGET, (void *)dn.bv_val ); - slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) ); - modv = Modifications2LDAPMods( &modlist ); + slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit ); + modv = slapi_x_modifications2ldapmods( &modlist ); slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)modv ); - rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_MODIFY_FN, pb ); - if ( rc != 0 ) { + rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_MODIFY_FN, pb ); + if ( rs->sr_err != 0 ) { /* * A preoperation plugin failure will abort the * entire operation. @@ -361,10 +339,10 @@ do_modify( Debug(LDAP_DEBUG_TRACE, "do_modify: modify preoperation plugin failed.\n", 0, 0, 0); #endif - if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0) { - rc = LDAP_OPERATIONS_ERROR; + if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0) { + rs->sr_err = LDAP_OTHER; } - ldap_mods_free( modv, 1 ); + slapi_x_free_ldapmods( modv ); modv = NULL; goto cleanup; } @@ -374,11 +352,25 @@ do_modify( * modification array, so we need to convert it back to * a Modification list. * - * Calling Modifications2LDAPMods() destroyed modlist so + * Calling slapi_x_modifications2ldapmods() destroyed modlist so * we don't need to free it. */ slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv ); - modlist = LDAPMods2Modifications( modv ); + modlist = slapi_x_ldapmods2modifications( modv ); + + /* + * NB: it is valid for the plugin to return no modifications + * (for example, a plugin might store some attributes elsewhere + * and remove them from the modification list; if only those + * attribute types were included in the modification request, + * then slapi_x_ldapmods2modifications() above will return + * NULL). + */ + if ( modlist == NULL ) { + rs->sr_err = LDAP_SUCCESS; + send_ldap_result( op, rs ); + goto cleanup; + } #endif /* defined( LDAP_SLAPI ) */ /* @@ -387,27 +379,25 @@ do_modify( * 2) this backend is master for what it holds; * 3) it's a replica and the dn supplied is the update_ndn. */ - if ( be->be_modify ) { + if ( op->o_bd->be_modify ) { /* do the update here */ - int repl_user = be_isupdate( be, &op->o_ndn ); + int repl_user = be_isupdate( op->o_bd, &op->o_ndn ); #ifndef SLAPD_MULTIMASTER /* Multimaster slapd does not have to check for replicator dn * because it accepts each modify request */ - if ( !be->be_update_ndn.bv_len || repl_user ) + if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) #endif { - int update = be->be_update_ndn.bv_len; - const char *text; + int update = op->o_bd->be_update_ndn.bv_len; char textbuf[SLAP_TEXT_BUFLEN]; size_t textlen = sizeof textbuf; - rc = slap_mods_check( modlist, update, &text, + rs->sr_err = slap_mods_check( modlist, update, &rs->sr_text, textbuf, textlen ); - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, - NULL, text, NULL, NULL ); + if( rs->sr_err != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); goto cleanup; } @@ -419,47 +409,45 @@ do_modify( /* empty */ } - rc = slap_mods_opattrs( be, op, modlist, modtail, &text, - textbuf, textlen ); - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, - NULL, text, - NULL, 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 cleanup; } } - if ( (*be->be_modify)( be, conn, op, &pdn, &ndn, modlist ) == 0 + op->orm_modlist = modlist; + if ( (op->o_bd->be_modify)( op, rs ) == 0 #ifdef SLAPD_MULTIMASTER && !repl_user #endif ) { /* but we log only the ones not from a replicator user */ - replog( be, op, &pdn, &ndn, modlist ); + replog( op ); } #ifndef SLAPD_MULTIMASTER /* send a referral */ } else { - BerVarray defref = be->be_update_refs - ? be->be_update_refs : default_referral; - BerVarray ref = referral_rewrite( defref, - NULL, &pdn, LDAP_SCOPE_DEFAULT ); - - send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, - ref ? ref : defref, NULL ); - - ber_bvarray_free( ref ); + BerVarray defref = op->o_bd->be_update_refs + ? op->o_bd->be_update_refs : default_referral; + rs->sr_ref = referral_rewrite( defref, + NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); + + if (!rs->sr_ref) rs->sr_ref = defref; + rs->sr_err = LDAP_REFERRAL; + send_ldap_result( op, rs ); + if (rs->sr_ref != defref) ber_bvarray_free( rs->sr_ref ); #endif } } else { - send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, - NULL, "operation not supported within namingContext", - NULL, NULL ); + send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, + "operation not supported within namingContext" ); } #if defined( LDAP_SLAPI ) - if ( doPluginFNs( be, SLAPI_PLUGIN_POST_MODIFY_FN, pb ) != 0 ) { + if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_MODIFY_FN, pb ) != 0 ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, INFO, "do_modify: modify postoperation plugins " "failed\n", 0, 0, 0 ); @@ -471,13 +459,13 @@ do_modify( #endif /* defined( LDAP_SLAPI ) */ cleanup: - free( pdn.bv_val ); - free( ndn.bv_val ); + free( op->o_req_dn.bv_val ); + free( op->o_req_ndn.bv_val ); if ( modlist != NULL ) slap_mods_free( modlist ); #if defined( LDAP_SLAPI ) - if ( modv != NULL ) FreeLDAPMods( modv ); + if ( modv != NULL ) slapi_x_free_ldapmods( modv ); #endif - return rc; + return rs->sr_err; } /* @@ -548,7 +536,7 @@ int slap_mods_check( } if ( is_at_obsolete( ad->ad_type ) && - ( ml->sml_op == LDAP_MOD_ADD || ml->sml_bvalues != NULL ) ) + ( ml->sml_op == LDAP_MOD_ADD || ml->sml_values != NULL ) ) { /* * attribute is obsolete, @@ -564,7 +552,7 @@ int slap_mods_check( /* * check values */ - if( ml->sml_bvalues != NULL ) { + if( ml->sml_values != NULL ) { ber_len_t nvals; slap_syntax_validate_func *validate = ad->ad_type->sat_syntax->ssyn_validate; @@ -585,14 +573,14 @@ int slap_mods_check( * check that each value is valid per syntax * and pretty if appropriate */ - for( nvals = 0; ml->sml_bvalues[nvals].bv_val; nvals++ ) { + for( nvals = 0; ml->sml_values[nvals].bv_val; nvals++ ) { struct berval pval; if( pretty ) { rc = pretty( ad->ad_type->sat_syntax, - &ml->sml_bvalues[nvals], &pval ); + &ml->sml_values[nvals], &pval ); } else { rc = validate( ad->ad_type->sat_syntax, - &ml->sml_bvalues[nvals] ); + &ml->sml_values[nvals] ); } if( rc != 0 ) { @@ -604,8 +592,8 @@ int slap_mods_check( } if( pretty ) { - ber_memfree( ml->sml_bvalues[nvals].bv_val ); - ml->sml_bvalues[nvals] = pval; + ber_memfree( ml->sml_values[nvals].bv_val ); + ml->sml_values[nvals] = pval; } } @@ -613,15 +601,46 @@ int slap_mods_check( * a rough single value check... an additional check is needed * to catch add of single value to existing single valued attribute */ - if( ( ml->sml_op == LDAP_MOD_ADD || ml->sml_op == LDAP_MOD_REPLACE ) + if ((ml->sml_op == LDAP_MOD_ADD || ml->sml_op == LDAP_MOD_REPLACE) && nvals > 1 && is_at_single_value( ad->ad_type )) { snprintf( textbuf, textlen, - "%s: multiple value provided", + "%s: multiple values provided", ml->sml_type.bv_val ); *text = textbuf; return LDAP_CONSTRAINT_VIOLATION; } + + if( nvals && ad->ad_type->sat_equality && + ad->ad_type->sat_equality->smr_normalize ) + { + ml->sml_nvalues = ch_malloc( (nvals+1)*sizeof(struct berval) ); + for( nvals = 0; ml->sml_values[nvals].bv_val; nvals++ ) { + rc = ad->ad_type->sat_equality->smr_normalize( + 0, + ad->ad_type->sat_syntax, + ad->ad_type->sat_equality, + &ml->sml_values[nvals], &ml->sml_nvalues[nvals] ); + if( rc ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, DETAIL1, + "str2entry: NULL (ssyn_normalize %d)\n", + rc, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "<= str2entry NULL (ssyn_normalize %d)\n", + rc, 0, 0 ); +#endif + snprintf( textbuf, textlen, + "%s: value #%ld normalization failed", + ml->sml_type.bv_val, (long) nvals ); + *text = textbuf; + return rc; + } + } + ml->sml_nvalues[nvals].bv_val = NULL; + ml->sml_nvalues[nvals].bv_len = 0; + } } } @@ -629,7 +648,6 @@ int slap_mods_check( } int slap_mods_opattrs( - Backend *be, Operation *op, Modifications *mods, Modifications **modtail, @@ -637,6 +655,7 @@ int slap_mods_opattrs( char *textbuf, size_t textlen ) { struct berval name, timestamp, csn; + struct berval nname; char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ]; char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ]; Modifications *mod; @@ -647,7 +666,7 @@ int slap_mods_opattrs( assert( modtail != NULL ); assert( *modtail == NULL ); - if( SLAP_LASTMOD(be) ) { + if( SLAP_LASTMOD(op->o_bd) ) { struct tm *ltm; time_t now = slap_get_time(); @@ -665,8 +684,10 @@ int slap_mods_opattrs( if( op->o_dn.bv_len == 0 ) { name.bv_val = SLAPD_ANONYMOUS; name.bv_len = sizeof(SLAPD_ANONYMOUS)-1; + nname = name; } else { name = op->o_dn; + nname = op->o_ndn; } } @@ -684,15 +705,23 @@ int slap_mods_opattrs( mod->sml_op = mop; mod->sml_type.bv_val = NULL; mod->sml_desc = slap_schema.si_ad_structuralObjectClass; - mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); - ber_dupbv( &mod->sml_bvalues[0], &tmpval ); - mod->sml_bvalues[1].bv_val = NULL; - assert( mod->sml_bvalues[0].bv_val ); + mod->sml_values = + (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_values[0], &tmpval ); + mod->sml_values[1].bv_len = 0; + mod->sml_values[1].bv_val = NULL; + assert( mod->sml_values[0].bv_val ); + mod->sml_nvalues = + (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_nvalues[0], &tmpval ); + mod->sml_nvalues[1].bv_len = 0; + mod->sml_nvalues[1].bv_val = NULL; + assert( mod->sml_nvalues[0].bv_val ); *modtail = mod; modtail = &mod->sml_next; } - if( SLAP_LASTMOD(be) ) { + if( SLAP_LASTMOD(op->o_bd) ) { char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ]; tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) ); @@ -702,10 +731,13 @@ int slap_mods_opattrs( mod->sml_op = mop; mod->sml_type.bv_val = NULL; mod->sml_desc = slap_schema.si_ad_entryUUID; - mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); - ber_dupbv( &mod->sml_bvalues[0], &tmpval ); - mod->sml_bvalues[1].bv_val = NULL; - assert( mod->sml_bvalues[0].bv_val ); + mod->sml_values = + (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_values[0], &tmpval ); + mod->sml_values[1].bv_len = 0; + mod->sml_values[1].bv_val = NULL; + assert( mod->sml_values[0].bv_val ); + mod->sml_nvalues = NULL; *modtail = mod; modtail = &mod->sml_next; @@ -713,10 +745,17 @@ int slap_mods_opattrs( mod->sml_op = mop; mod->sml_type.bv_val = NULL; mod->sml_desc = slap_schema.si_ad_creatorsName; - mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); - ber_dupbv( &mod->sml_bvalues[0], &name ); - mod->sml_bvalues[1].bv_val = NULL; - assert( mod->sml_bvalues[0].bv_val ); + mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_values[0], &name ); + mod->sml_values[1].bv_len = 0; + mod->sml_values[1].bv_val = NULL; + assert( mod->sml_values[0].bv_val ); + mod->sml_nvalues = + (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_nvalues[0], &nname ); + mod->sml_nvalues[1].bv_len = 0; + mod->sml_nvalues[1].bv_val = NULL; + assert( mod->sml_nvalues[0].bv_val ); *modtail = mod; modtail = &mod->sml_next; @@ -724,24 +763,28 @@ int slap_mods_opattrs( mod->sml_op = mop; mod->sml_type.bv_val = NULL; mod->sml_desc = slap_schema.si_ad_createTimestamp; - mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); - ber_dupbv( &mod->sml_bvalues[0], ×tamp ); - mod->sml_bvalues[1].bv_val = NULL; - assert( mod->sml_bvalues[0].bv_val ); + mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_values[0], ×tamp ); + mod->sml_values[1].bv_len = 0; + mod->sml_values[1].bv_val = NULL; + assert( mod->sml_values[0].bv_val ); + mod->sml_nvalues = NULL; *modtail = mod; modtail = &mod->sml_next; } } - if( SLAP_LASTMOD(be) ) { + if( SLAP_LASTMOD(op->o_bd) ) { mod = (Modifications *) ch_malloc( sizeof( Modifications ) ); mod->sml_op = mop; mod->sml_type.bv_val = NULL; mod->sml_desc = slap_schema.si_ad_entryCSN; - mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); - ber_dupbv( &mod->sml_bvalues[0], &csn ); - mod->sml_bvalues[1].bv_val = NULL; - assert( mod->sml_bvalues[0].bv_val ); + mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_values[0], &csn ); + mod->sml_values[1].bv_len = 0; + mod->sml_values[1].bv_val = NULL; + assert( mod->sml_values[0].bv_val ); + mod->sml_nvalues = NULL; *modtail = mod; modtail = &mod->sml_next; @@ -749,10 +792,17 @@ int slap_mods_opattrs( mod->sml_op = mop; mod->sml_type.bv_val = NULL; mod->sml_desc = slap_schema.si_ad_modifiersName; - mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); - ber_dupbv( &mod->sml_bvalues[0], &name ); - mod->sml_bvalues[1].bv_val = NULL; - assert( mod->sml_bvalues[0].bv_val ); + mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_values[0], &name ); + mod->sml_values[1].bv_len = 0; + mod->sml_values[1].bv_val = NULL; + assert( mod->sml_values[0].bv_val ); + mod->sml_nvalues = + (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_nvalues[0], &nname ); + mod->sml_nvalues[1].bv_len = 0; + mod->sml_nvalues[1].bv_val = NULL; + assert( mod->sml_nvalues[0].bv_val ); *modtail = mod; modtail = &mod->sml_next; @@ -760,10 +810,12 @@ int slap_mods_opattrs( mod->sml_op = mop; mod->sml_type.bv_val = NULL; mod->sml_desc = slap_schema.si_ad_modifyTimestamp; - mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); - ber_dupbv( &mod->sml_bvalues[0], ×tamp ); - mod->sml_bvalues[1].bv_val = NULL; - assert( mod->sml_bvalues[0].bv_val ); + mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); + ber_dupbv( &mod->sml_values[0], ×tamp ); + mod->sml_values[1].bv_len = 0; + mod->sml_values[1].bv_val = NULL; + assert( mod->sml_values[0].bv_val ); + mod->sml_nvalues = NULL; *modtail = mod; modtail = &mod->sml_next; } @@ -772,154 +824,3 @@ int slap_mods_opattrs( return LDAP_SUCCESS; } -#ifdef LDAP_SLAPI -/* - * Synthesise an LDAPMod array from a Modifications list to pass - * to SLAPI. This synthesis is destructive and as such the - * Modifications list may not be used after calling this - * function. - * - * This function must also be called before slap_mods_check(). - */ -static LDAPMod **Modifications2LDAPMods(Modifications **pmodlist) -{ - Modifications *ml, *modlist; - LDAPMod **mods, *modp; - int i, j; - - modlist = *pmodlist; - - for( i = 0, ml = modlist; ml != NULL; i++, ml = ml->sml_next ) - ; - - mods = (LDAPMod **)ch_malloc( (i + 1) * sizeof(LDAPMod *) ); - - for( i = 0, ml = modlist; ml != NULL; ml = ml->sml_next ) { - modp = mods[i]; - modp->mod_op = ml->sml_op | LDAP_MOD_BVALUES; - - /* Take ownership of original type. */ - modp->mod_type = ml->sml_type.bv_val; - ml->sml_type.bv_val = NULL; - - if ( ml->sml_bvalues != NULL ) { - for( j = 0; ml->sml_bvalues[j].bv_val != NULL; j++ ) - ; - modp->mod_bvalues = (struct berval **)ch_malloc( (j + 1) * - sizeof(struct berval *) ); - for( j = 0; ml->sml_bvalues[j].bv_val != NULL; j++ ) { - /* Take ownership of original values. */ - modp->mod_bvalues[j] = (struct berval *)ch_malloc( sizeof(struct berval) ); - modp->mod_bvalues[j]->bv_len = ml->sml_bvalues[j].bv_len; - modp->mod_bvalues[j]->bv_val = ml->sml_bvalues[j].bv_val; - ml->sml_bvalues[j].bv_len = 0; - ml->sml_bvalues[j].bv_val = NULL; - } - modp->mod_bvalues[j] = NULL; - } else { - modp->mod_bvalues = NULL; - } - i++; - } - - mods[i] = NULL; - - slap_mods_free( modlist ); - *pmodlist = NULL; - - return mods; -} - -/* - * Convert a potentially modified array of LDAPMods back to a - * Modification list. - * - * The returned Modification list contains pointers into the - * LDAPMods array; the latter MUST be freed with FreeLDAPMods() - * (see below). - */ -static Modifications *LDAPMods2Modifications (LDAPMod **mods) -{ - Modifications *modlist, **modtail; - LDAPMod **modp; - - modtail = &modlist; - - for( modp = mods; *modp != NULL; modp++ ) { - Modifications *mod; - int i; - char **p; - struct berval **bvp; - - mod = (Modifications *) ch_malloc( sizeof(Modifications) ); - mod->sml_op = (*modp)->mod_op & (~LDAP_MOD_BVALUES); - mod->sml_type.bv_val = (*modp)->mod_type; - mod->sml_type.bv_len = strlen( mod->sml_type.bv_val ); - mod->sml_desc = NULL; - mod->sml_next = NULL; - - if ( (*modp)->mod_op & LDAP_MOD_BVALUES ) { - for( i = 0, bvp = (*modp)->mod_bvalues; *bvp != NULL; bvp++, i++ ) - ; - } else { - for( i = 0, p = (*modp)->mod_values; *p != NULL; p++, i++ ) - ; - } - - mod->sml_bvalues = (BerVarray) ch_malloc( (i + 1) * sizeof(struct berval) ); - - /* NB: This implicitly trusts a plugin to return valid modifications. */ - if ( (*modp)->mod_op & LDAP_MOD_BVALUES ) { - for( i = 0, bvp = (*modp)->mod_bvalues; *bvp != NULL; bvp++, i++ ) { - mod->sml_bvalues[i].bv_val = (*bvp)->bv_val; - mod->sml_bvalues[i].bv_len = (*bvp)->bv_len; - } - } else { - for( i = 0, p = (*modp)->mod_values; *p != NULL; p++, i++ ) { - mod->sml_bvalues[i].bv_val = *p; - mod->sml_bvalues[i].bv_len = strlen( *p ); - } - } - mod->sml_bvalues[i].bv_val = NULL; - - *modtail = mod; - modtail = &mod->sml_next; - } - - return modlist; -} - -/* - * This function only frees the parts of the mods array that - * are not shared with the Modification list that was created - * by LDAPMods2Modifications. - * - */ -static void FreeLDAPMods (LDAPMod **mods) -{ - int i, j; - - if (mods == NULL) - return; - - for ( i = 0; mods[i] != NULL; i++ ) { - /* - * Don't free values themselves; they're owned by the - * Modification list. Do free the containing array. - */ - if ( mods[i]->mod_op & LDAP_MOD_BVALUES ) { - for ( j = 0; mods[i]->mod_bvalues[j] != NULL; j++ ) { - ch_free( mods[i]->mod_bvalues[j] ); - } - ch_free( mods[i]->mod_bvalues ); - } else { - ch_free( mods[i]->mod_values ); - } - /* Don't free type, for same reasons. */ - ch_free( mods[i] ); - } - ch_free( mods ); -} - -#endif /* LDAP_SLAPI */ -