/* modify.c - ldbm backend modify routine */
/* $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
*/
const char *dn,
Modifications *modlist,
Entry *e,
- const char **text
+ const char **text,
+ char *textbuf,
+ size_t textlen
)
{
int rc, err;
Modifications *ml;
Attribute *save_attrs;
- Debug(LDAP_DEBUG_TRACE, "ldbm_modify_internal:\n", 0, 0, 0);
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "ldbm_modify_internal: %s\n", dn ));
+#else
+ Debug(LDAP_DEBUG_TRACE, "ldbm_modify_internal: %s\n", dn, 0, 0);
+#endif
+
if ( !acl_check_modlist( be, conn, op, e, modlist )) {
return LDAP_INSUFFICIENT_ACCESS;
switch ( mod->sm_op ) {
case LDAP_MOD_ADD:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "ldbm_modify_internal: add\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: add\n", 0, 0, 0);
- err = add_values( e, mod, op->o_ndn );
+#endif
+
+ err = add_values( e, mod, op->o_ndn.bv_val );
if( err != LDAP_SUCCESS ) {
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
- err, text, 0);
*text = "modify: add values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_modify_internal: failed %d (%s)\n",
+ err, *text ));
+#else
+ Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
+ err, *text, 0);
+#endif
}
break;
case LDAP_MOD_DELETE:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "ldbm_modify_internal: delete\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: delete\n", 0, 0, 0);
- err = delete_values( e, mod, op->o_ndn );
+#endif
+
+ err = delete_values( e, mod, op->o_ndn.bv_val );
assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) {
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
- err, text, 0);
*text = "modify: delete values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_modify_internal: failed %d (%s)\n", err, *text ));
+#else
+ Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
+ err, *text, 0);
+#endif
}
break;
case LDAP_MOD_REPLACE:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "ldbm_modify_internal: replace\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: replace\n", 0, 0, 0);
- err = replace_values( e, mod, op->o_ndn );
+#endif
+
+ err = replace_values( e, mod, op->o_ndn.bv_val );
assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) {
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
- err, text, 0);
*text = "modify: replace values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_modify_internal: failed %d (%s)\n", err, *text ));
+#else
+ Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
+ err, *text, 0);
+#endif
+
}
break;
case SLAP_MOD_SOFTADD:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "ldbm_modify_internal: softadd\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: softadd\n", 0, 0, 0);
- /* Avoid problems in index_add_mods()
- * We need to add index if necessary.
- */
- mod->sm_op = LDAP_MOD_ADD;
- err = add_values( e, mod, op->o_ndn );
+#endif
+
+ /* Avoid problems in index_add_mods()
+ * We need to add index if necessary.
+ */
+ mod->sm_op = LDAP_MOD_ADD;
+ err = add_values( e, mod, op->o_ndn.bv_val );
- if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
- err = LDAP_SUCCESS;
- }
+ if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
+ err = LDAP_SUCCESS;
+ }
if( err != LDAP_SUCCESS ) {
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
- err, text, 0);
*text = "modify: (soft)add values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_modify_internal: failed %d (%s)\n", err, *text ));
+#else
+ Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
+ err, *text, 0);
+#endif
+
}
- break;
+ break;
default:
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_modify_internal: invalid op %d\n", mod->sm_op ));
+#else
Debug(LDAP_DEBUG_ANY, "ldbm_modify_internal: invalid op %d\n",
mod->sm_op, 0, 0);
- *text = "Invalid modify operation";
+#endif
+
err = LDAP_OTHER;
+ *text = "Invalid modify operation";
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_modify_internal: %d (%s)\n", err, *text ));
+#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
- err, text, 0);
+ err, *text, 0);
+#endif
+
}
if ( err != LDAP_SUCCESS ) {
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
/* check that the entry still obeys the schema */
- rc = entry_schema_check( e, save_attrs, text );
+ rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) {
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_modify_internal: entry failed schema check: %s\n",
+ *text ));
+#else
Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
*text, 0, 0 );
+#endif
+
return rc;
}
}
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- /* run through the attributes removing old indices */
- for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
- mod = &ml->sml_mod;
+ /* delete indices for old attributes */
+ index_entry_del( be, e, save_attrs);
- switch ( mod->sm_op ) {
- case LDAP_MOD_REPLACE: {
- /* Need to remove all values from indexes */
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
- Attribute *a = save_attrs
- ? attr_find( save_attrs, mod->sm_desc )
- : NULL;
-
- if( a != NULL ) {
- (void) index_change_values( be,
- mod->mod_type,
- a->a_vals,
- e->e_id,
- SLAP_INDEX_DELETE_OP );
- }
-#endif
- } break;
-
- case LDAP_MOD_DELETE:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
- /* remove deleted values */
- (void) index_change_values( be,
- mod->mod_type,
- mod->mod_bvalues,
- e->e_id,
- SLAP_INDEX_DELETE_OP );
-#endif
- break;
- }
- }
+ /* add indices for new attributes */
+ index_entry_add( be, e, e->e_attrs);
attrs_free( save_attrs );
- /* run through the attributes adding new indices */
- for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
- mod = &ml->sml_mod;
-
- switch ( mod->sm_op ) {
- case LDAP_MOD_REPLACE:
- case LDAP_MOD_ADD:
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
- (void) index_change_values( be,
- mod->mod_type,
- mod->mod_bvalues,
- e->e_id,
- SLAP_INDEX_ADD_OP );
-#endif
- break;
-
- case LDAP_MOD_DELETE: {
- /* Need to add all remaining values */
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
- Attribute *a = e->e_attrs
- ? attr_find( e->e_attrs, mod->sm_desc )
- : NULL;
-
- if( a != NULL ) {
- (void) index_change_values( be,
- mod->mod_type,
- a->a_vals,
- e->e_id,
- SLAP_INDEX_ADD_OP );
- }
-#endif
- } break;
- }
- }
-
return LDAP_SUCCESS;
}
Backend *be,
Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
+ struct berval *dn,
+ struct berval *ndn,
Modifications *modlist
)
{
Entry *e;
int manageDSAit = get_manageDSAit( op );
const char *text = NULL;
+ char textbuf[SLAP_TEXT_BUFLEN];
+ size_t textlen = sizeof textbuf;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "ldbm_back_modify: enter\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0);
+#endif
+
/* acquire and lock entry */
if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
char* matched_dn = NULL;
- struct berval **refs = NULL;
+ BVarray refs;
if ( matched != NULL ) {
matched_dn = ch_strdup( matched->e_dn );
: NULL;
cache_return_entry_r( &li->li_cache, matched );
} else {
- refs = default_referral;
+ refs = referral_rewrite( default_referral,
+ NULL, dn, LDAP_SCOPE_DEFAULT );
}
send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- if ( matched != NULL ) {
- ber_bvecfree( refs );
- free( matched_dn );
- }
+ if ( refs ) bvarray_free( refs );
+ free( matched_dn );
return( -1 );
}
if ( !manageDSAit && is_entry_referral( e ) ) {
/* parent is a referral, don't allow add */
/* parent is an alias, don't allow add */
- struct berval **refs = get_entry_referrals( be,
+ BVarray refs = get_entry_referrals( be,
conn, op, e );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldbm_back_modify: entry (%s) is referral\n", ndn->bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );
+#endif
+
send_ldap_result( conn, op, LDAP_REFERRAL,
e->e_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ if ( refs ) bvarray_free( refs );
goto error_return;
}
/* Modify the entry */
- rc = ldbm_modify_internal( be, conn, op, ndn, modlist, e, &text );
+ rc = ldbm_modify_internal( be, conn, op, ndn->bv_val, modlist, e,
+ &text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
if( rc != SLAPD_ABANDON ) {
send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
+ NULL, text, NULL, NULL );
}
goto error_return;
int i;
Attribute *a;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* char *desc = mod->sm_desc->ad_cname->bv_val; */
+ /* char *desc = mod->sm_desc->ad_cname.bv_val; */
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
- if( mr == NULL ) {
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-
-#else
- /* char *desc = mod->mod_type; */
-#endif
-
a = attr_find( e->e_attrs, mod->sm_desc );
/* check if the values we're adding already exist */
if ( a != NULL ) {
- for ( i = 0; mod->sm_bvalues[i] != NULL; i++ ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ if( mr == NULL || !mr->smr_match ) {
+ /* do not allow add of additional attribute
+ if no equality rule exists */
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
+ for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
int rc;
int j;
const char *text = NULL;
- struct berval *asserted;
+ struct berval asserted;
rc = value_normalize( mod->sm_desc,
SLAP_MR_EQUALITY,
- mod->sm_bvalues[i],
+ &mod->sm_bvalues[i],
&asserted,
&text );
if( rc != LDAP_SUCCESS ) return rc;
- for ( j = 0; a->a_vals[j] != NULL; j++ ) {
+ for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
int match;
int rc = value_match( &match, mod->sm_desc, mr,
- a->a_vals[j], asserted, &text );
+ SLAP_MR_VALUE_SYNTAX_MATCH,
+ &a->a_vals[j], &asserted, &text );
if( rc == LDAP_SUCCESS && match == 0 ) {
- ber_bvfree( asserted );
+ free( asserted.bv_val );
return LDAP_TYPE_OR_VALUE_EXISTS;
}
}
- ber_bvfree( asserted );
-#else
- if ( value_find( a->a_vals, mod->sm_bvalues[i],
- a->a_syntax, 3 ) == 0 ) {
- return( LDAP_TYPE_OR_VALUE_EXISTS );
- }
-#endif
+ free( asserted.bv_val );
}
}
{
int i, j, k, found;
Attribute *a;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- char *desc = mod->sm_desc->ad_cname->bv_val;
+ char *desc = mod->sm_desc->ad_cname.bv_val;
MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
- if( mr == NULL || !mr->smr_match ) {
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-#else
- char *desc = mod->mod_type;
-#endif
-
/* delete the entire attribute */
if ( mod->sm_bvalues == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "delete_values: removing entire attribute %s\n", desc ));
+#else
Debug( LDAP_DEBUG_ARGS, "removing entire attribute %s\n",
desc, 0, 0 );
+#endif
+
return( attr_delete( &e->e_attrs, mod->sm_desc ) ?
LDAP_NO_SUCH_ATTRIBUTE : LDAP_SUCCESS );
}
+ if( mr == NULL || !mr->smr_match ) {
+ /* disallow specific attributes from being deleted if
+ no equality rule */
+ return LDAP_INAPPROPRIATE_MATCHING;
+ }
+
/* delete specific values - find the attribute first */
if ( (a = attr_find( e->e_attrs, mod->sm_desc )) == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldap_modify_delete: Could not find attribute %s\n", desc ));
+#else
Debug( LDAP_DEBUG_ARGS, "ldap_modify_delete: "
"could not find attribute %s\n",
desc, 0, 0 );
+#endif
+
return( LDAP_NO_SUCH_ATTRIBUTE );
}
/* find each value to delete */
- for ( i = 0; mod->sm_bvalues[i] != NULL; i++ ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
int rc;
const char *text = NULL;
- struct berval *asserted;
+ struct berval asserted;
rc = value_normalize( mod->sm_desc,
SLAP_MR_EQUALITY,
- mod->sm_bvalues[i],
+ &mod->sm_bvalues[i],
&asserted,
&text );
if( rc != LDAP_SUCCESS ) return rc;
-#endif
found = 0;
- for ( j = 0; a->a_vals[j] != NULL; j++ ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
int match;
int rc = value_match( &match, mod->sm_desc, mr,
- a->a_vals[j], asserted, &text );
+ SLAP_MR_VALUE_SYNTAX_MATCH,
+ &a->a_vals[j], &asserted, &text );
- if( rc == LDAP_SUCCESS && match != 0 )
-#else
- if ( value_cmp( mod->mod_bvalues[i], a->a_vals[j],
- a->a_syntax, 3 ) != 0 )
-#endif
- {
+ if( rc == LDAP_SUCCESS && match != 0 ) {
continue;
}
+
+ /* found a matching value */
found = 1;
- /* found a matching value - delete it */
- ber_bvfree( a->a_vals[j] );
- for ( k = j + 1; a->a_vals[k] != NULL; k++ ) {
+ /* delete it */
+ free( a->a_vals[j].bv_val );
+ for ( k = j + 1; a->a_vals[k].bv_val != NULL; k++ ) {
a->a_vals[k - 1] = a->a_vals[k];
}
- a->a_vals[k - 1] = NULL;
-
- /* delete the entire attribute, if no values remain */
- if ( a->a_vals[0] == NULL) {
- Debug( LDAP_DEBUG_ARGS,
- "removing entire attribute %s\n",
- desc, 0, 0 );
- if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- ber_bvfree( asserted );
-#endif
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
- }
+ a->a_vals[k - 1].bv_val = NULL;
break;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- ber_bvfree( asserted );
-#endif
+ free( asserted.bv_val );
/* looked through them all w/o finding it */
if ( ! found ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
+ "delete_values: could not find value for attr %s\n", desc ));
+#else
Debug( LDAP_DEBUG_ARGS,
"ldbm_modify_delete: could not find value for attr %s\n",
desc, 0, 0 );
+#endif
+
+ return LDAP_NO_SUCH_ATTRIBUTE;
+ }
+ }
+
+ /* if no values remain, delete the entire attribute */
+ if ( a->a_vals[0].bv_val == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ "delete_values: removing entire attribute %s\n", desc ));
+#else
+ Debug( LDAP_DEBUG_ARGS,
+ "removing entire attribute %s\n",
+ desc, 0, 0 );
+#endif
+
+ if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
return LDAP_NO_SUCH_ATTRIBUTE;
}
}
projects / openldap / blobdiff