global_lastmod == ON)) && !update )
{
#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = slap_mods_opattrs( op, &mods, &text );
+ Modifications **modstail;
+ for( modstail = &mods;
+ *modstail != NULL;
+ modstail = &(*modstail)->sml_next )
+ {
+ /* empty */
+ }
+ rc = slap_mods_opattrs( op, modstail, &text );
#else
char *text = "no-user-modification attribute type";
rc = add_modified_attrs( op, &mods );
mod = (Modifications *)
ch_calloc( 1, sizeof(Modifications) );
- ad = mod->sml_desc;
+ /* copy the op */
+ mod->sml_op = ml->ml_op;
/* convert to attribute description */
- rc = slap_str2ad( ml->ml_type, &ad, text );
+ rc = slap_str2ad( ml->ml_type, &mod->sml_desc, text );
if( rc != LDAP_SUCCESS ) {
slap_mods_free( mod );
return rc;
}
+ ad = mod->sml_desc;
+
if( slap_syntax_is_binary( ad->ad_type->sat_syntax )
&& !slap_ad_is_binary( ad ))
{
slap_syntax_validate_func *validate =
ad->ad_type->sat_syntax->ssyn_validate;
+ if( !validate ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "modlist2mods: no validator for syntax %s\n",
+ ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
+ slap_mods_free( mod );
+ *text = "no validator for syntax";
+ return LDAP_INVALID_SYNTAX;
+ }
+
/*
* check that each value is valid per syntax
*/
* a rough single value check... an additional check is needed
* to catch add of single value to existing single valued attribute
*/
- if( ( ml->ml_op == LDAP_MOD_ADD || ml->ml_op == LDAP_MOD_REPLACE )
+ if( ( mod->sml_op == LDAP_MOD_ADD || mod->sml_op == LDAP_MOD_REPLACE )
&& nvals > 1 && is_at_single_value( ad->ad_type ))
{
slap_mods_free( mod );
int mop = op->o_tag == LDAP_REQ_ADD
? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
+ assert( modtail != NULL );
+ assert( *modtail == NULL );
+
ldap_pvt_thread_mutex_lock( &gmtime_mutex );
ltm = gmtime( &now );
strftime( timebuf, sizeof(timebuf), "%Y%m%d%H%M%SZ", ltm );
timestamp.bv_len = strlen(timebuf);
if( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- name.bv_val = "<anonymous>";
- name.bv_len = sizeof("<anonymous>")-1;
+ name.bv_val = SLAPD_ANONYMOUS;
+ name.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
} else {
name.bv_val = op->o_dn;
name.bv_len = strlen( op->o_dn );
if( op->o_tag == LDAP_REQ_ADD ) {
mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
mod->sml_op = mop;
- mod->sml_desc = slap_schema.si_ad_creatorsName;
+ mod->sml_desc = ad_dup( 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;
mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
mod->sml_op = mop;
- mod->sml_desc = slap_schema.si_ad_createTimestamp;
+ mod->sml_desc = ad_dup( 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;
mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
mod->sml_op = mop;
- mod->sml_desc = slap_schema.si_ad_modifiersName;
+ mod->sml_desc = ad_dup( 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;
mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ) );
mod->sml_op = mop;
- mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
+ mod->sml_desc = ad_dup( 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;
}
if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- bv.bv_val = "<anonymous>";
- bv.bv_len = sizeof("<anonymous>")-1;
+ bv.bv_val = SLAPD_ANONYMOUS;
+ bv.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
} else {
bv.bv_val = op->o_dn;
bv.bv_len = strlen( bv.bv_val );