/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
char *last;
ber_tag_t tag;
ber_len_t len;
- LDAPModList *modlist = NULL;
- LDAPModList **modtail = &modlist;
+ Modifications *modlist = NULL;
+ Modifications **modtail = &modlist;
#ifdef LDAP_DEBUG
- LDAPModList *tmp;
+ Modifications *tmp;
#endif
- Modifications *mods = NULL;
Backend *be;
int rc;
const char *text;
* }
*/
- if ( ber_scanf( op->o_ber, "{o" /*}*/, &dn ) == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: ber_scanf failed\n" ));
tag = ber_next_element( op->o_ber, &len, last ) )
{
ber_int_t mop;
+ Modifications tmp, *mod;
- (*modtail) = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
- if ( ber_scanf( op->o_ber, "{i{a[V]}}", &mop,
- &(*modtail)->ml_type, &(*modtail)->ml_bvalues )
+ if ( ber_scanf( op->o_ber, "{i{m[W]}}", &mop,
+ &tmp.sml_type, &tmp.sml_bvalues )
== LBER_ERROR )
{
send_ldap_disconnect( conn, op,
goto cleanup;
}
+ mod = (Modifications *) ch_malloc( sizeof(Modifications) );
+ mod->sml_type = tmp.sml_type;
+ mod->sml_bvalues = tmp.sml_bvalues;
+ mod->sml_desc = NULL;
+ *modtail = mod;
+
switch( mop ) {
case LDAP_MOD_ADD:
- if ( (*modtail)->ml_bvalues == NULL ) {
+ if ( mod->sml_bvalues == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: modify/add operation (%ld) requires values\n",
}
}
- (*modtail)->ml_op = mop;
- modtail = &(*modtail)->ml_next;
+ mod->sml_op = mop;
+ modtail = &mod->sml_next;
}
*modtail = NULL;
Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
#endif
- for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_next ) {
+ for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
- "\t%s: %s\n", tmp->ml_op == LDAP_MOD_ADD ?
- "add" : (tmp->ml_op == LDAP_MOD_DELETE ?
- "delete" : "replace"), tmp->ml_type ));
+ "\t%s: %s\n", tmp->sml_op == LDAP_MOD_ADD ?
+ "add" : (tmp->sml_op == LDAP_MOD_DELETE ?
+ "delete" : "replace"), tmp->sml_type.bv_val ));
- if ( tmp->ml_bvalues == NULL ) {
+ if ( tmp->sml_bvalues == NULL ) {
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"\t\tno values" ));
- } else if ( tmp->ml_bvalues[0] == NULL ) {
+ } else if ( tmp->sml_bvalues[0].bv_val == NULL ) {
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"\t\tzero values" ));
- } else if ( tmp->ml_bvalues[1] == NULL ) {
+ } else if ( tmp->sml_bvalues[1].bv_val == NULL ) {
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"\t\tone value" ));
} else {
#else
Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n",
- tmp->ml_op == LDAP_MOD_ADD
- ? "add" : (tmp->ml_op == LDAP_MOD_DELETE
- ? "delete" : "replace"), tmp->ml_type, 0 );
+ tmp->sml_op == LDAP_MOD_ADD
+ ? "add" : (tmp->sml_op == LDAP_MOD_DELETE
+ ? "delete" : "replace"), tmp->sml_type.bv_val, 0 );
- if ( tmp->ml_bvalues == NULL ) {
+ if ( tmp->sml_bvalues == NULL ) {
Debug( LDAP_DEBUG_ARGS, "%s\n",
"\t\tno values", NULL, NULL );
- } else if ( tmp->ml_bvalues[0] == NULL ) {
+ } else if ( tmp->sml_bvalues[0].bv_val == NULL ) {
Debug( LDAP_DEBUG_ARGS, "%s\n",
"\t\tzero values", NULL, NULL );
- } else if ( tmp->ml_bvalues[1] == NULL ) {
+ } else if ( tmp->sml_bvalues[1].bv_val == NULL ) {
Debug( LDAP_DEBUG_ARGS, "%s, length %ld\n",
- "\t\tone value", (long) tmp->ml_bvalues[0]->bv_len, NULL );
+ "\t\tone value", (long) tmp->sml_bvalues[0].bv_len, NULL );
} else {
Debug( LDAP_DEBUG_ARGS, "%s\n",
"\t\tmultiple values", NULL, NULL );
* if we don't hold it.
*/
if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
- struct berval **ref = referral_rewrite( default_referral,
+ BerVarray ref = referral_rewrite( default_referral,
NULL, &pdn, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, ref ? ref : default_referral, NULL );
- ber_bvecfree( ref );
+ ber_bvarray_free( ref );
goto cleanup;
}
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf;
- rc = slap_modlist2mods( modlist, update, &mods, &text,
+ rc = slap_mods_check( modlist, update, &text,
textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
goto cleanup;
}
- if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && !repl_user )
- {
- Modifications **modstail;
- for( modstail = &mods;
- *modstail != NULL;
- modstail = &(*modstail)->sml_next )
+ if ( SLAP_LASTMOD(be) && !repl_user ) {
+ for( modtail = &modlist;
+ *modtail != NULL;
+ modtail = &(*modtail)->sml_next )
{
/* empty */
}
- rc = slap_mods_opattrs( op, mods, modstail, &text,
+ rc = slap_mods_opattrs( op, modlist, modtail, &text,
textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
}
}
- if ( (*be->be_modify)( be, conn, op, &pdn, &ndn, mods ) == 0
+ if ( (*be->be_modify)( be, conn, op, &pdn, &ndn, modlist ) == 0
#ifdef SLAPD_MULTIMASTER
&& !repl_user
#endif
) {
/* but we log only the ones not from a replicator user */
- replog( be, op, &pdn, &ndn, mods );
+ replog( be, op, &pdn, &ndn, modlist );
}
#ifndef SLAPD_MULTIMASTER
/* send a referral */
} else {
- struct berval **defref = be->be_update_refs
+ BerVarray defref = be->be_update_refs
? be->be_update_refs : default_referral;
- struct berval **ref = referral_rewrite( defref,
+ 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_bvecfree( ref );
+ ber_bvarray_free( ref );
#endif
}
} else {
}
cleanup:
- free( dn.bv_val );
free( pdn.bv_val );
free( ndn.bv_val );
if ( modlist != NULL )
- slap_modlist_free( modlist );
- if ( mods != NULL )
- slap_mods_free( mods );
+ slap_mods_free( modlist );
return rc;
}
/*
- * convert a raw list of modifications to internal format
* Do basic attribute type checking and syntax validation.
*/
-int slap_modlist2mods(
- LDAPModList *ml,
+int slap_mods_check(
+ Modifications *ml,
int update,
- Modifications **mods,
const char **text,
char *textbuf,
size_t textlen )
{
int rc;
- Modifications **modtail = mods;
- for( ; ml != NULL; ml = ml->ml_next ) {
- Modifications *mod;
+ for( ; ml != NULL; ml = ml->sml_next ) {
AttributeDescription *ad = NULL;
- mod = (Modifications *)
- ch_calloc( 1, sizeof(Modifications) );
-
- /* copy the op */
- mod->sml_op = ml->ml_op;
-
/* convert to attribute description */
- rc = slap_str2ad( ml->ml_type, &mod->sml_desc, text );
+ rc = slap_bv2ad( &ml->sml_type, &ml->sml_desc, text );
if( rc != LDAP_SUCCESS ) {
- slap_mods_free( mod );
snprintf( textbuf, textlen, "%s: %s",
- ml->ml_type, *text );
+ ml->sml_type.bv_val, *text );
*text = textbuf;
return rc;
}
- ad = mod->sml_desc;
+ ad = ml->sml_desc;
if( slap_syntax_is_binary( ad->ad_type->sat_syntax )
&& !slap_ad_is_binary( ad ))
{
/* attribute requires binary transfer */
- slap_mods_free( mod );
-
snprintf( textbuf, textlen,
"%s: requires ;binary transfer",
- ml->ml_type );
+ ml->sml_type.bv_val );
*text = textbuf;
return LDAP_UNDEFINED_TYPE;
}
&& slap_ad_is_binary( ad ))
{
/* attribute requires binary transfer */
- slap_mods_free( mod );
snprintf( textbuf, textlen,
"%s: disallows ;binary transfer",
- ml->ml_type );
+ ml->sml_type.bv_val );
*text = textbuf;
return LDAP_UNDEFINED_TYPE;
}
if (!update && is_at_no_user_mod( ad->ad_type )) {
/* user modification disallowed */
- slap_mods_free( mod );
snprintf( textbuf, textlen,
"%s: no user modification allowed",
- ml->ml_type );
+ ml->sml_type.bv_val );
*text = textbuf;
return LDAP_CONSTRAINT_VIOLATION;
}
if ( is_at_obsolete( ad->ad_type ) &&
- ( mod->sml_op == LDAP_MOD_ADD || ml->ml_bvalues != NULL ) )
+ ( ml->sml_op == LDAP_MOD_ADD || ml->sml_bvalues != NULL ) )
{
/*
* attribute is obsolete,
* only allow replace/delete with no values
*/
- slap_mods_free( mod );
snprintf( textbuf, textlen,
"%s: attribute is obsolete",
- ml->ml_type );
+ ml->sml_type.bv_val );
*text = textbuf;
return LDAP_CONSTRAINT_VIOLATION;
}
/*
* check values
*/
- if( ml->ml_bvalues != NULL ) {
+ if( ml->sml_bvalues != NULL ) {
ber_len_t nvals;
slap_syntax_validate_func *validate =
ad->ad_type->sat_syntax->ssyn_validate;
ad->ad_type->sat_syntax->ssyn_pretty;
if( !pretty && !validate ) {
- slap_mods_free( mod );
*text = "no validator for syntax";
snprintf( textbuf, textlen,
"%s: no validator for syntax %s",
- ml->ml_type,
+ ml->sml_type.bv_val,
ad->ad_type->sat_syntax->ssyn_oid );
*text = textbuf;
return LDAP_INVALID_SYNTAX;
* check that each value is valid per syntax
* and pretty if appropriate
*/
- for( nvals = 0; ml->ml_bvalues[nvals]; nvals++ ) {
- struct berval *pval = NULL;
+ for( nvals = 0; ml->sml_bvalues[nvals].bv_val; nvals++ ) {
+ struct berval pval;
if( pretty ) {
rc = pretty( ad->ad_type->sat_syntax,
- ml->ml_bvalues[nvals], &pval );
+ &ml->sml_bvalues[nvals], &pval );
} else {
rc = validate( ad->ad_type->sat_syntax,
- ml->ml_bvalues[nvals] );
+ &ml->sml_bvalues[nvals] );
}
if( rc != 0 ) {
- slap_mods_free( mod );
snprintf( textbuf, textlen,
"%s: value #%ld invalid per syntax",
- ml->ml_type, (long) nvals );
+ ml->sml_type.bv_val, (long) nvals );
*text = textbuf;
return LDAP_INVALID_SYNTAX;
}
if( pretty ) {
- ber_memfree( ml->ml_bvalues[nvals]->bv_val );
- *ml->ml_bvalues[nvals] = *pval;
- free( pval );
+ ber_memfree( ml->sml_bvalues[nvals].bv_val );
+ ml->sml_bvalues[nvals] = pval;
}
}
* a rough single value check... an additional check is needed
* to catch add of single value to existing single valued attribute
*/
- if( ( mod->sml_op == LDAP_MOD_ADD || mod->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 ))
{
- slap_mods_free( mod );
snprintf( textbuf, textlen,
"%s: multiple value provided",
- ml->ml_type );
+ ml->sml_type.bv_val );
*text = textbuf;
return LDAP_CONSTRAINT_VIOLATION;
}
}
-
- mod->sml_bvalues = ml->ml_bvalues;
- ml->ml_values = NULL;
-
- *modtail = mod;
- modtail = &mod->sml_next;
}
return LDAP_SUCCESS;
return rc;
}
if ( tmpval.bv_len ) {
- mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+ mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = mop;
+ mod->sml_type.bv_val = NULL;
mod->sml_desc = slap_schema.si_ad_structuralObjectClass;
- mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
- mod->sml_bvalues[0] = ber_bvdup( &tmpval );
- mod->sml_bvalues[1] = NULL;
- assert( mod->sml_bvalues[0] );
+ 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 );
*modtail = mod;
modtail = &mod->sml_next;
}
tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
tmpval.bv_val = uuidbuf;
- mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+ mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = mop;
+ mod->sml_type.bv_val = NULL;
mod->sml_desc = slap_schema.si_ad_entryUUID;
- mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
- mod->sml_bvalues[0] = ber_bvdup( &tmpval );
- mod->sml_bvalues[1] = NULL;
- assert( mod->sml_bvalues[0] );
+ 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 );
*modtail = mod;
modtail = &mod->sml_next;
- mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+ mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = mop;
+ mod->sml_type.bv_val = NULL;
mod->sml_desc = slap_schema.si_ad_creatorsName;
- mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
- mod->sml_bvalues[0] = ber_bvdup( &name );
- mod->sml_bvalues[1] = NULL;
- assert( mod->sml_bvalues[0] );
+ 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 );
*modtail = mod;
modtail = &mod->sml_next;
- mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+ mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = mop;
+ mod->sml_type.bv_val = NULL;
mod->sml_desc = slap_schema.si_ad_createTimestamp;
- mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof( struct berval * ) );
- mod->sml_bvalues[0] = ber_bvdup( ×tamp );
- mod->sml_bvalues[1] = NULL;
- assert( mod->sml_bvalues[0] );
+ 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 );
*modtail = mod;
modtail = &mod->sml_next;
}
- mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+ 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 = (struct berval **) malloc( 2 * sizeof(struct berval *) );
- mod->sml_bvalues[0] = ber_bvdup( &csn );
- mod->sml_bvalues[1] = NULL;
- assert( mod->sml_bvalues[0] );
+ 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 );
*modtail = mod;
modtail = &mod->sml_next;
- mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+ mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = mop;
+ mod->sml_type.bv_val = NULL;
mod->sml_desc = slap_schema.si_ad_modifiersName;
- mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof(struct berval *) );
- mod->sml_bvalues[0] = ber_bvdup( &name );
- mod->sml_bvalues[1] = NULL;
- assert( mod->sml_bvalues[0] );
+ 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 );
*modtail = mod;
modtail = &mod->sml_next;
- mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
+ mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = mop;
+ mod->sml_type.bv_val = NULL;
mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
- mod->sml_bvalues = (struct berval **) malloc( 2 * sizeof(struct berval *) );
- mod->sml_bvalues[0] = ber_bvdup( ×tamp );
- mod->sml_bvalues[1] = NULL;
- assert( mod->sml_bvalues[0] );
+ 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 );
*modtail = mod;
modtail = &mod->sml_next;
+ *modtail = NULL;
+
return LDAP_SUCCESS;
}
-
projects / openldap / blobdiff