/* modify.c - ldbm backend modify routine */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include "back-ldbm.h"
#include "proto-back-ldbm.h"
-static void add_lastmods(Operation *op, LDAPModList **ml);
-
-
-static void
-add_lastmods( Operation *op, LDAPModList **modlist )
-{
- char buf[22];
- struct berval bv;
- struct berval *bvals[2];
- LDAPModList **m;
- LDAPModList *tmp;
- struct tm *ltm;
- time_t currenttime;
-
- Debug( LDAP_DEBUG_TRACE, "add_lastmods\n", 0, 0, 0 );
-
- bvals[0] = &bv;
- bvals[1] = NULL;
-
- /* remove any attempts by the user to modify these attrs */
- for ( m = modlist; *m != NULL; m = &(*m)->ml_next ) {
- if ( oc_check_operational( (*m)->ml_type ) ) {
- Debug( LDAP_DEBUG_TRACE,
- "add_lastmods: found operational attr: %s\n",
- (*m)->ml_type, 0, 0 );
- tmp = *m;
- *m = (*m)->ml_next;
- free( tmp->ml_type );
- if ( tmp->ml_bvalues != NULL ) {
- ber_bvecfree( tmp->ml_bvalues );
- }
- free( tmp );
- if (!*m)
- break;
- }
- }
-
- if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- bv.bv_val = "NULLDN";
- bv.bv_len = strlen( bv.bv_val );
- } else {
- bv.bv_val = op->o_dn;
- bv.bv_len = strlen( bv.bv_val );
- }
- tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
- tmp->ml_type = ch_strdup( "modifiersname" );
- tmp->ml_op = LDAP_MOD_REPLACE;
- tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
- tmp->ml_bvalues[0] = ber_bvdup( &bv );
- tmp->ml_next = *modlist;
- *modlist = tmp;
-
- currenttime = slap_get_time();
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#ifndef LDAP_LOCALTIME
- ltm = gmtime( ¤ttime );
- strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
-#else
- ltm = localtime( ¤ttime );
- strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
-#endif
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-
- bv.bv_val = buf;
- bv.bv_len = strlen( bv.bv_val );
- tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
- tmp->ml_type = ch_strdup( "modifytimestamp" );
- tmp->ml_op = LDAP_MOD_REPLACE;
- tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
- tmp->ml_bvalues[0] = ber_bvdup( &bv );
- tmp->ml_next = *modlist;
- *modlist = tmp;
-
-}
+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
Backend *be,
Connection *conn,
Operation *op,
- char *dn,
- LDAPModList *modlist,
- Entry *e
+ const char *dn,
+ Modifications *modlist,
+ Entry *e,
+ const char **text,
+ char *textbuf,
+ size_t textlen
)
{
- int err;
- LDAPMod *mod;
- LDAPModList *ml;
- Attribute *a;
-
- if ( ((be->be_lastmod == ON)
- || ((be->be_lastmod == UNDEFINED)&&(global_lastmod == ON)))
- && (be->be_update_ndn == NULL)) {
+ int rc, err;
+ Modification *mod;
+ Modifications *ml;
+ Attribute *save_attrs;
+
+#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
- /* XXX: It may be wrong, it changes mod time even if
- * mod fails!
- */
- add_lastmods( op, &modlist );
+ if ( !acl_check_modlist( be, conn, op, e, modlist )) {
+ return LDAP_INSUFFICIENT_ACCESS;
}
+ save_attrs = e->e_attrs;
+ e->e_attrs = attrs_dup( e->e_attrs );
- if ( (err = acl_check_modlist( be, conn, op, e, modlist ))
- != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, err, NULL, NULL );
- return -1;
- }
+ for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+ mod = &ml->sml_mod;
- for ( ml = modlist; ml != NULL; ml = ml->ml_next ) {
+ 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);
+#endif
- mod = &ml->ml_mod;
+ err = add_values( e, mod, op->o_ndn.bv_val );
- switch ( mod->mod_op & ~LDAP_MOD_BVALUES ) {
- case LDAP_MOD_ADD:
- err = add_values( e, mod, op->o_ndn );
+ if( err != LDAP_SUCCESS ) {
+ *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:
- err = delete_values( e, mod, op->o_ndn );
+#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);
+#endif
+
+ err = delete_values( e, mod, op->o_ndn.bv_val );
+ assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
+ if( err != LDAP_SUCCESS ) {
+ *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:
- /* Need to remove all values from indexes before they
- * are lost.
+#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);
+#endif
+
+ err = replace_values( e, mod, op->o_ndn.bv_val );
+ assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
+ if( err != LDAP_SUCCESS ) {
+ *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);
+#endif
+
+ /* Avoid problems in index_add_mods()
+ * We need to add index if necessary.
*/
- if( e->e_attrs
- && ((a = attr_find( e->e_attrs, mod->mod_type ))
- != NULL) ) {
-
- (void) index_change_values( be,
- mod->mod_type,
- a->a_vals,
- e->e_id,
- __INDEX_DELETE_OP);
+ 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;
}
- err = replace_values( e, mod, op->o_ndn );
+ if( err != LDAP_SUCCESS ) {
+ *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;
- case LDAP_MOD_SOFTADD:
- /* Avoid problems in index_add_mods()
- * We need to add index if necessary.
- */
- mod->mod_op = LDAP_MOD_ADD;
- if ( (err = add_values( e, mod, op->o_ndn ))
- == LDAP_TYPE_OR_VALUE_EXISTS ) {
-
- err = LDAP_SUCCESS;
- mod->mod_op = LDAP_MOD_SOFTADD;
-
- }
- 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);
+#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);
+#endif
+
}
if ( err != LDAP_SUCCESS ) {
+ attrs_free( e->e_attrs );
+ e->e_attrs = save_attrs;
/* unlock entry, delete from cache */
- send_ldap_result( conn, op, err, NULL, NULL );
- return -1;
+ return err;
}
}
- /* check that the entry still obeys the schema */
- if ( global_schemacheck && oc_schema_check( e ) != 0 ) {
- Debug( LDAP_DEBUG_ANY, "entry failed schema check\n", 0, 0, 0 );
- send_ldap_result( conn, op, LDAP_OBJECT_CLASS_VIOLATION, NULL, NULL );
- return -1;
- }
-
/* check for abandon */
ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
if ( op->o_abandon ) {
+ attrs_free( e->e_attrs );
+ e->e_attrs = save_attrs;
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- return -1;
+ return SLAPD_ABANDON;
}
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- /* modify indexes */
- if ( index_add_mods( be, modlist, e->e_id ) != 0 ) {
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL, NULL );
- return -1;
+ /* check that the entry still obeys the schema */
+ 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;
}
/* check for abandon */
ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
if ( op->o_abandon ) {
+ attrs_free( e->e_attrs );
+ e->e_attrs = save_attrs;
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- return -1;
+ return SLAPD_ABANDON;
}
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- return 0;
+ /* delete indices for old attributes */
+ index_entry_del( be, e, save_attrs);
+
+ /* add indices for new attributes */
+ index_entry_add( be, e, e->e_attrs);
-}/* int ldbm_modify_internal() */
+ attrs_free( save_attrs );
+
+ return LDAP_SUCCESS;
+}
int
Backend *be,
Connection *conn,
Operation *op,
- char *dn,
- LDAPModList *modlist
+ struct berval *dn,
+ struct berval *ndn,
+ Modifications *modlist
)
{
+ int rc;
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- char *matched;
+ Entry *matched;
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, dn, &matched )) == NULL ) {
- send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, matched,
- NULL );
+ if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
+ char* matched_dn = NULL;
+ BVarray refs;
+
if ( matched != NULL ) {
- free( matched );
+ matched_dn = ch_strdup( matched->e_dn );
+ refs = is_entry_referral( matched )
+ ? get_entry_referrals( be, conn, op, matched )
+ : NULL;
+ cache_return_entry_r( &li->li_cache, matched );
+ } else {
+ refs = referral_rewrite( default_referral,
+ NULL, dn, LDAP_SCOPE_DEFAULT );
}
+
+ send_ldap_result( conn, op, LDAP_REFERRAL,
+ matched_dn, NULL, refs, NULL );
+
+ if ( refs ) bvarray_free( refs );
+ free( matched_dn );
+
return( -1 );
}
- /* Modify the entry */
- if ( ldbm_modify_internal( be, conn, op, dn, modlist, e ) != 0 ) {
+ 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,
+ 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 );
+
+ if ( refs ) bvarray_free( refs );
goto error_return;
+ }
+
+ /* Modify the entry */
+ 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 );
+ }
+
+ goto error_return;
}
/* change the entry itself */
if ( id2entry_add( be, e ) != 0 ) {
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL, NULL );
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, "id2entry failure", NULL, NULL );
goto error_return;
}
- send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL );
+ send_ldap_result( conn, op, LDAP_SUCCESS,
+ NULL, NULL, NULL, NULL );
+
cache_return_entry_w( &li->li_cache, e );
return( 0 );
return( -1 );
}
-int
+static int
add_values(
Entry *e,
- LDAPMod *mod,
+ 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 = attr_find( e->e_attrs, mod->mod_type )) != NULL ) {
- for ( i = 0; mod->mod_bvalues[i] != NULL; i++ ) {
- if ( value_find( a->a_vals, mod->mod_bvalues[i],
- a->a_syntax, 3 ) == 0 ) {
- return( LDAP_TYPE_OR_VALUE_EXISTS );
+ 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->mod_type, mod->mod_bvalues ) != 0 ) {
- return( LDAP_CONSTRAINT_VIOLATION );
+ 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 );
+ return LDAP_SUCCESS;
}
-int
+static int
delete_values(
Entry *e,
- LDAPMod *mod,
+ 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->mod_bvalues == NULL ) {
+ 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",
- mod->mod_type, 0, 0 );
- return( attr_delete( &e->e_attrs, mod->mod_type ) ?
+ 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->mod_type )) == NULL ) {
- Debug( LDAP_DEBUG_ARGS, "could not find attribute %s\n",
- mod->mod_type, 0, 0 );
+ 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->mod_bvalues[i] != NULL; i++ ) {
+ 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] != NULL; j++ ) {
- if ( value_cmp( mod->mod_bvalues[i], a->a_vals[j],
- a->a_syntax, 3 ) != 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;
- /* 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;
+ 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,
- "could not find value for attr %s\n",
- mod->mod_type, 0, 0 );
- return( LDAP_NO_SUCH_ATTRIBUTE );
+ "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 );
+ return LDAP_SUCCESS;
}
-int
+static int
replace_values(
Entry *e,
- LDAPMod *mod,
+ Modification *mod,
char *dn
)
{
+ int rc = attr_delete( &e->e_attrs, mod->sm_desc );
- /* XXX: BEFORE YOU GET RID OF PREVIOUS VALUES REMOVE FROM INDEX
- * FILES
- */
-
- (void) attr_delete( &e->e_attrs, mod->mod_type );
+ if( rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_ATTRIBUTE ) {
+ return rc;
+ }
- if ( attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 ) {
- return( LDAP_CONSTRAINT_VIOLATION );
+ if ( mod->sm_bvalues != NULL &&
+ attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
+ {
+ return LDAP_OTHER;
}
- return( LDAP_SUCCESS );
+ return LDAP_SUCCESS;
}
projects / openldap / blobdiff