const char *text;
int manageDSAit;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+ "do_modify: enter\n" ));
+#else
Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
+#endif
/*
* Parse the modify request. It looks like this:
*/
if ( ber_scanf( op->o_ber, "{a" /*}*/, &dn ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_modify: ber_scanf failed\n" ));
+#else
Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
+#endif
+
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
return SLAPD_DISCONNECT;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+ "do_modify: dn (%s)\n", dn ));
+#else
Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn, 0, 0 );
+#endif
+
/* collect modifications & save for later */
switch( mop ) {
case LDAP_MOD_ADD:
if ( (*modtail)->ml_bvalues == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_modify: modify/add operation (%ld) requires values\n",
+ (long)mop ));
+#else
Debug( LDAP_DEBUG_ANY,
"do_modify: modify/add operation (%ld) requires values\n",
(long) mop, 0, 0 );
+#endif
+
send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
NULL, "modify/add operation requires values",
NULL, NULL );
break;
default: {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_modify: invalid modify operation (%ld)\n",
+ (long)mop ));
+#else
Debug( LDAP_DEBUG_ANY,
"do_modify: invalid modify operation (%ld)\n",
(long) mop, 0, 0 );
+#endif
+
send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
NULL, "unrecognized modify operation", NULL, NULL );
rc = LDAP_PROTOCOL_ERROR;
*modtail = NULL;
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_modify: get_ctrls failed\n" ));
+#else
Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
+#endif
+
goto cleanup;
}
ndn = ch_strdup( dn );
if( dn_normalize( ndn ) == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_modify: invalid dn (%s)\n", dn ));
+#else
Debug( LDAP_DEBUG_ANY, "do_modify: invalid dn (%s)\n", dn, 0, 0 );
+#endif
+
send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
"invalid DN", NULL, NULL );
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" ));
+#else
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 );
goto cleanup;
+
+#if defined( SLAPD_SCHEMA_DN )
+ } else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_modify: attempt to modify subschema subentry.\n" ));
+#else
+ 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 );
+ goto cleanup;
+#endif
}
#ifdef LDAP_DEBUG
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+ "do_modify: modifications:\n" ));
+#else
Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
+#endif
+
for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_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 ));
+#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 );
+#endif
+
}
#endif
*/
if ( be->be_modify ) {
/* do the update here */
+ int repl_user = (be->be_update_ndn != NULL &&
+ strcmp( be->be_update_ndn, op->o_ndn ) == 0);
#ifndef SLAPD_MULTIMASTER
- /* we don't have to check for replicator dn
- * because we accept each modify request
+ /* Multimaster slapd does not have to check for replicator dn
+ * because it accepts each modify request
*/
- if ( be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+ if ( be->be_update_ndn == NULL || repl_user )
#endif
{
int update = be->be_update_ndn != NULL;
const char *text;
- rc = slap_modlist2mods( modlist, update, &mods, &text );
+ char textbuf[SLAP_TEXT_BUFLEN];
+ size_t textlen = sizeof textbuf;
+
+ rc = slap_modlist2mods( modlist, update, &mods, &text,
+ textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
}
if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && !update )
+ global_lastmod == ON)) && !repl_user )
{
Modifications **modstail;
for( modstail = &mods;
if ( (*be->be_modify)( be, conn, op, dn, ndn, mods ) == 0
#ifdef SLAPD_MULTIMASTER
- && ( be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn ) != 0 )
+ && !repl_user
#endif
) {
/* but we log only the ones not from a replicator user */
LDAPModList *ml,
int update,
Modifications **mods,
- const char **text )
+ const char **text,
+ char *textbuf,
+ size_t textlen )
{
int rc;
Modifications **modtail = mods;
if( rc != LDAP_SUCCESS ) {
slap_mods_free( mod );
+ snprintf( textbuf, textlen, "%s: %s",
+ ml->ml_type, *text );
+ *text = textbuf;
return rc;
}
{
/* attribute requires binary transfer */
slap_mods_free( mod );
- *text = "attribute requires ;binary transfer";
+
+ snprintf( textbuf, textlen,
+ "%s: requires ;binary transfer",
+ ml->ml_type );
+ *text = textbuf;
return LDAP_UNDEFINED_TYPE;
}
{
/* attribute requires binary transfer */
slap_mods_free( mod );
- *text = "attribute disallows ;binary transfer";
+ snprintf( textbuf, textlen,
+ "%s: disallows ;binary transfer",
+ ml->ml_type );
+ *text = textbuf;
return LDAP_UNDEFINED_TYPE;
}
if (!update && is_at_no_user_mod( ad->ad_type )) {
/* user modification disallowed */
slap_mods_free( mod );
- *text = "no user modification allowed";
+ snprintf( textbuf, textlen,
+ "%s: no user modification allowed",
+ ml->ml_type );
+ *text = textbuf;
+ 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;
}
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";
+ snprintf( textbuf, textlen,
+ "%s: no validator for syntax %s",
+ ml->ml_type,
+ ad->ad_type->sat_syntax->ssyn_oid );
+ *text = textbuf;
return LDAP_INVALID_SYNTAX;
}
if( rc != 0 ) {
slap_mods_free( mod );
- *text = "value contains invalid data";
+ snprintf( textbuf, textlen,
+ "%s: value #%ld invalid per syntax",
+ ml->ml_type, (long) nvals );
+ *text = textbuf;
return LDAP_INVALID_SYNTAX;
}
}
&& nvals > 1 && is_at_single_value( ad->ad_type ))
{
slap_mods_free( mod );
- *text = "multiple values provided";
- return LDAP_INVALID_SYNTAX;
+ snprintf( textbuf, textlen,
+ "%s: multiple value provided",
+ ml->ml_type );
+ *text = textbuf;
+ 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 );
- }
-}
projects / openldap / blobdiff