/* modify.c - ldbm backend modify routine */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 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 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.
Connection *conn,
Operation *op,
char *dn,
- LDAPModList *modlist,
+ Modifications *modlist,
Entry *e
)
{
int err;
- LDAPMod *mod;
- LDAPModList *ml;
- Attribute *a;
+ Modification *mod;
+ Modifications *ml;
Attribute *save_attrs;
- if ( (err = acl_check_modlist( be, conn, op, e, modlist ))
- != LDAP_SUCCESS )
- {
- send_ldap_result( conn, op, err,
- NULL, NULL, NULL, NULL );
- return -1;
+ 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 );
- for ( ml = modlist; ml != NULL; ml = ml->ml_next ) {
- mod = &ml->ml_mod;
+ for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+ mod = &ml->sml_mod;
- switch ( mod->mod_op & ~LDAP_MOD_BVALUES ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ switch ( mod->sm_op )
+#else
+ switch ( mod->mod_op )
+#endif
+ {
case LDAP_MOD_ADD:
err = add_values( e, mod, op->o_ndn );
break;
err = replace_values( e, mod, op->o_ndn );
break;
- case LDAP_MOD_SOFTADD:
+ case SLAP_MOD_SOFTADD:
/* Avoid problems in index_add_mods()
* We need to add index if necessary.
*/
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ mod->sm_op = LDAP_MOD_ADD;
+#else
mod->mod_op = LDAP_MOD_ADD;
- if ( (err = add_values( e, mod, op->o_ndn ))
- == LDAP_TYPE_OR_VALUE_EXISTS ) {
-
+#endif
+ err = add_values( e, mod, op->o_ndn );
+ if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
err = LDAP_SUCCESS;
- mod->mod_op = LDAP_MOD_SOFTADD;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ mod->sm_op = SLAP_MOD_SOFTADD;
+#else
+ mod->mod_op = SLAP_MOD_SOFTADD;
+#endif
}
break;
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
/* unlock entry, delete from cache */
- send_ldap_result( conn, op, err,
- NULL, NULL, NULL, NULL );
- return -1;
+ return err;
}
}
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 );
/* check that the entry still obeys the schema */
- if ( global_schemacheck && oc_schema_check( e ) != 0 ) {
+ if ( schema_check_entry( e ) != 0 ) {
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
Debug( LDAP_DEBUG_ANY, "entry failed schema check\n", 0, 0, 0 );
- send_ldap_result( conn, op, LDAP_OBJECT_CLASS_VIOLATION,
- NULL, NULL, NULL, NULL );
- return -1;
+ return LDAP_OBJECT_CLASS_VIOLATION;
}
/* check for 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 );
/* remove old indices */
if( save_attrs != NULL ) {
- for ( ml = modlist; ml != NULL; ml = ml->ml_next ) {
- mod = &ml->ml_mod;
- if( ( mod->mod_op & ~LDAP_MOD_BVALUES )
- == LDAP_MOD_REPLACE )
+ for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+ mod = &ml->sml_mod;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ if ( mod->sm_op == LDAP_MOD_REPLACE )
+#else
+ if ( mod->mod_op == LDAP_MOD_REPLACE )
+#endif
{
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ /* not yet implemented */
+#else
/* Need to remove all values from indexes */
- a = attr_find( save_attrs, mod->mod_type );
+ Attribute *a = attr_find( save_attrs, mod->mod_type );
if( a != NULL ) {
(void) index_change_values( be,
mod->mod_type,
a->a_vals,
e->e_id,
- __INDEX_DELETE_OP);
+ SLAP_INDEX_DELETE_OP);
}
+#endif
}
}
attrs_free( save_attrs );
/* modify indexes */
if ( index_add_mods( be, modlist, e->e_id ) != 0 ) {
/* our indices are likely hosed */
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
- NULL, NULL, NULL, NULL );
- return -1;
+ return LDAP_OTHER;
}
- /* check for abandon */
- ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
- if ( op->o_abandon ) {
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- return -1;
- }
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
-
- return 0;
+ return LDAP_SUCCESS;
}
Connection *conn,
Operation *op,
char *dn,
- LDAPModList *modlist
+ char *ndn,
+ Modifications *modlist
)
{
+ int rc;
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
Entry *matched;
Entry *e;
Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0);
/* acquire and lock entry */
- if ( (e = dn2entry_w( be, dn, &matched )) == NULL ) {
+ if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
char* matched_dn = NULL;
struct berval **refs = NULL;
}
/* Modify the entry */
- if ( ldbm_modify_internal( be, conn, op, dn, modlist, e ) != 0 ) {
+ rc = ldbm_modify_internal( be, conn, op, ndn, modlist, e );
+
+ if( rc != LDAP_SUCCESS ) {
+ if( rc != SLAPD_ABANDON ) {
+ send_ldap_result( conn, op, rc,
+ NULL, NULL, NULL, NULL );
+ }
+
goto error_return;
}
/* change the entry itself */
if ( id2entry_add( be, e ) != 0 ) {
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+ send_ldap_result( conn, op, LDAP_OTHER,
NULL, NULL, NULL, NULL );
goto error_return;
}
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
)
{
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ /* not yet implemented */
+#else
int i;
Attribute *a;
if( attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 ) {
return( LDAP_CONSTRAINT_VIOLATION );
}
+#endif
return( LDAP_SUCCESS );
}
-int
+static int
delete_values(
Entry *e,
- LDAPMod *mod,
+ Modification *mod,
char *dn
)
{
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ /* not yet implemented */
+#else
int i, j, k, found;
Attribute *a;
return( LDAP_NO_SUCH_ATTRIBUTE );
}
}
+#endif
return( LDAP_SUCCESS );
}
-int
+static int
replace_values(
Entry *e,
- LDAPMod *mod,
+ Modification *mod,
char *dn
)
{
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ /* not yet implemented */
+#else
(void) attr_delete( &e->e_attrs, mod->mod_type );
- if ( attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 ) {
+ if ( mod->mod_bvalues != NULL &&
+ attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 )
+ {
return( LDAP_CONSTRAINT_VIOLATION );
}
+#endif
return( LDAP_SUCCESS );
}
projects / openldap / blobdiff