#include "back-ldbm.h"
#include "proto-back-ldbm.h"
-static int add_values LDAP_P(( Entry *e, Modification *mod, char *dn ));
-static int delete_values LDAP_P(( Entry *e, Modification *mod, char *dn ));
-static int replace_values LDAP_P(( Entry *e, Modification *mod, char *dn ));
-
/* We need this function because of LDAP modrdn. If we do not
* add this there would be a bunch of code replication here
* and there and of course the likelihood of bugs increases.
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: add\n", 0, 0, 0);
#endif
- rc = add_values( e, mod, op->o_ndn.bv_val );
-
+ rc = modify_add_values( e, mod, text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
- *text = "modify: add values failed";
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n",
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: delete\n", 0, 0, 0);
#endif
- rc = delete_values( e, mod, op->o_ndn.bv_val );
+ rc = modify_delete_values( e, mod, text, textbuf, textlen );
assert( rc != LDAP_TYPE_OR_VALUE_EXISTS );
if( rc != LDAP_SUCCESS ) {
- *text = "modify: delete values failed";
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: replace\n", 0, 0, 0);
#endif
- rc = replace_values( e, mod, op->o_ndn.bv_val );
+ rc = modify_replace_values( e, mod, text, textbuf, textlen );
assert( rc != LDAP_TYPE_OR_VALUE_EXISTS );
if( rc != LDAP_SUCCESS ) {
- *text = "modify: replace values failed";
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
#endif
-
}
break;
* We need to add index if necessary.
*/
mod->sm_op = LDAP_MOD_ADD;
- rc = add_values( e, mod, op->o_ndn.bv_val );
+ rc = modify_add_values( e, mod, text, textbuf, textlen );
if ( rc == LDAP_TYPE_OR_VALUE_EXISTS ) {
rc = LDAP_SUCCESS;
}
if( rc != LDAP_SUCCESS ) {
- *text = "modify: (soft)add values failed";
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
#endif
-
}
break;
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
#endif
-
}
if ( rc != LDAP_SUCCESS ) {
goto exit;
}
+ /* If objectClass was modified, reset the flags */
+ if ( mod->sm_desc == slap_schema.si_ad_objectClass ) {
+ e->e_ocflags = 0;
+ }
+
/* check if modified attribute was indexed */
rc = index_is_indexed( be, mod->sm_desc );
if ( rc == LDAP_SUCCESS ) {
/* acquire and lock entry */
if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
char* matched_dn = NULL;
- BVarray refs;
+ BerVarray refs;
if ( matched != NULL ) {
matched_dn = ch_strdup( matched->e_dn );
send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- if ( refs ) bvarray_free( refs );
+ if ( refs ) ber_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 */
- BVarray refs = get_entry_referrals( be,
+ BerVarray refs = get_entry_referrals( be,
conn, op, e );
#ifdef NEW_LOGGING
send_ldap_result( conn, op, LDAP_REFERRAL,
e->e_dn, NULL, refs, NULL );
- if ( refs ) bvarray_free( refs );
+ if ( refs ) ber_bvarray_free( refs );
goto error_return;
}
cache_return_entry_w( &li->li_cache, e );
return( -1 );
}
-
-static int
-add_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int i;
- Attribute *a;
-
- /* char *desc = mod->sm_desc->ad_cname.bv_val; */
- MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
-
- a = attr_find( e->e_attrs, mod->sm_desc );
-
- /* check if the values we're adding already exist */
- if ( a != NULL ) {
- 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;
-
- rc = value_normalize( mod->sm_desc,
- SLAP_MR_EQUALITY,
- &mod->sm_bvalues[i],
- &asserted,
- &text );
-
- if( rc != LDAP_SUCCESS ) return rc;
-
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
- int match;
- int rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_VALUE_SYNTAX_MATCH,
- &a->a_vals[j], &asserted, &text );
-
- if( rc == LDAP_SUCCESS && match == 0 ) {
- free( asserted.bv_val );
- return LDAP_TYPE_OR_VALUE_EXISTS;
- }
- }
-
- free( asserted.bv_val );
- }
- }
-
- /* no - add them */
- if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
- /* this should return result return of attr_merge */
- return LDAP_OTHER;
- }
-
- return LDAP_SUCCESS;
-}
-
-static int
-delete_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int i, j, k, found;
- Attribute *a;
- char *desc = mod->sm_desc->ad_cname.bv_val;
- MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
-
- /* 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].bv_val != NULL; i++ ) {
- int rc;
- const char *text = NULL;
-
- struct berval asserted;
-
- rc = value_normalize( mod->sm_desc,
- SLAP_MR_EQUALITY,
- &mod->sm_bvalues[i],
- &asserted,
- &text );
-
- if( rc != LDAP_SUCCESS ) return rc;
-
- found = 0;
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
- int match;
- int rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_VALUE_SYNTAX_MATCH,
- &a->a_vals[j], &asserted, &text );
-
- if( rc == LDAP_SUCCESS && match != 0 ) {
- continue;
- }
-
- /* found a matching value */
- found = 1;
-
- /* 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].bv_val = NULL;
-
- break;
- }
-
- 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;
- }
- }
-
- return LDAP_SUCCESS;
-}
-
-static int
-replace_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int rc = attr_delete( &e->e_attrs, mod->sm_desc );
-
- if( rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_ATTRIBUTE ) {
- return rc;
- }
-
- if ( mod->sm_bvalues != NULL &&
- attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
- {
- return LDAP_OTHER;
- }
-
- return LDAP_SUCCESS;
-}
projects / openldap / blobdiff