goto cleanup;
}
- if( ndn == '\0' ) {
+ if( *ndn == '\0' ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: attempt to modify root DSE.\n" ));
if( rc != LDAP_SUCCESS ) {
slap_mods_free( mod );
- snprintf( textbuf, textlen, "%s: %s", ml->ml_type, text );
+ snprintf( textbuf, textlen, "%s: %s",
+ ml->ml_type, *text );
*text = textbuf;
return rc;
}
return LDAP_CONSTRAINT_VIOLATION;
}
+ if ( is_at_obsolete( ad->ad_type ) &&
+ ( mod->sml_op == LDAP_MOD_ADD || ml->ml_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 );
+ *text = textbuf;
+ return LDAP_CONSTRAINT_VIOLATION;
+ }
+
/*
* check values
*/
ad->ad_type->sat_syntax->ssyn_validate;
if( !validate ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "modlist2mods: %s: no validator for syntax %s\n",
- ml->ml_type, ad->ad_type->sat_syntax->ssyn_oid ));
-#else
- Debug( LDAP_DEBUG_TRACE,
- "modlist2mods: %s: no validator for syntax %s\n",
- ml->ml_type, ad->ad_type->sat_syntax->ssyn_oid, 0 );
-#endif
-
slap_mods_free( mod );
*text = "no validator for syntax";
snprintf( textbuf, textlen,
if( rc != 0 ) {
slap_mods_free( mod );
snprintf( textbuf, textlen,
- "%s: value #%ld contains invalid data",
+ "%s: value #%ld invalid per syntax",
ml->ml_type, (long) nvals );
*text = textbuf;
return LDAP_INVALID_SYNTAX;
"%s: multiple value provided",
ml->ml_type );
*text = textbuf;
- return LDAP_INVALID_SYNTAX;
+ return LDAP_CONSTRAINT_VIOLATION;
}
}
return LDAP_SUCCESS;
}
-
-void
-slap_mod_free(
- Modification *mod,
- int freeit
-)
-{
- ad_free( mod->sm_desc, 1 );
-
- if ( mod->sm_bvalues != NULL )
- ber_bvecfree( mod->sm_bvalues );
-
- if( freeit )
- free( mod );
-}
-
-void
-slap_mods_free(
- Modifications *ml
-)
-{
- Modifications *next;
-
- for ( ; ml != NULL; ml = next ) {
- next = ml->sml_next;
-
- slap_mod_free( &ml->sml_mod, 0 );
- free( ml );
- }
-}
-
-void
-slap_modlist_free(
- LDAPModList *ml
-)
-{
- LDAPModList *next;
-
- for ( ; ml != NULL; ml = next ) {
- next = ml->ml_next;
-
- if (ml->ml_type)
- free( ml->ml_type );
-
- if ( ml->ml_bvalues != NULL )
- ber_bvecfree( ml->ml_bvalues );
-
- free( ml );
- }
-}