Sync with HEAD as of 14-March-2004

[openldap] / servers / slapd / back-bdb / modify.c

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 80bb20b0b64773006721f1d6d789d3495742eb06..bc3e7ab48c63be92d058e35ed55befa808f96d4d 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,6 +23,11 @@
 #include "back-bdb.h"
 #include "external.h"
 
+static struct berval scbva[] = {
+       BER_BVC("glue"),
+       BER_BVNULL
+};
+
 int bdb_modify_internal(
        Operation *op,
        DB_TXN *tid,
@@ -37,6 +42,7 @@ int bdb_modify_internal(
        Modifications   *ml;
        Attribute       *save_attrs;
        Attribute       *ap;
+       int                     glue_attr_delete = 0;
 
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ENTRY, "bdb_modify_internal: 0x%08lx: %s\n", 
@@ -54,6 +60,38 @@ int bdb_modify_internal(
        save_attrs = e->e_attrs;
        e->e_attrs = attrs_dup( e->e_attrs );
 
+       for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+               int match;
+               mod = &ml->sml_mod;
+               switch( mod->sm_op ) {
+               case LDAP_MOD_ADD:
+               case LDAP_MOD_REPLACE:
+                       if ( mod->sm_desc == slap_schema.si_ad_structuralObjectClass ) {
+                               value_match( &match, slap_schema.si_ad_structuralObjectClass,
+                               slap_schema.si_ad_structuralObjectClass->ad_type->sat_equality,
+                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+                               &mod->sm_values[0], &scbva[0], text );
+                               if ( !match )
+                                       glue_attr_delete = 1;
+                       }
+               }
+               if ( glue_attr_delete )
+                       break;
+       }
+
+       if ( glue_attr_delete ) {
+               Attribute       **app = &e->e_attrs;
+               while ( *app != NULL ) {
+                       if ( !is_at_operational( (*app)->a_desc->ad_type )) {
+                               Attribute *save = *app;
+                               *app = (*app)->a_next;
+                               attr_free( save );
+                               continue;
+                       }
+                       app = &(*app)->a_next;
+               }
+       }
+
        for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
                mod = &ml->sml_mod;
 
@@ -78,6 +116,8 @@ int bdb_modify_internal(
                        break;
 
                case LDAP_MOD_DELETE:
+                       if ( glue_attr_delete )
+                               break;
 #ifdef NEW_LOGGING
                        LDAP_LOG ( OPERATION, DETAIL1, 
                                "bdb_modify_internal: delete\n", 0, 0, 0 );
@@ -203,6 +243,10 @@ int bdb_modify_internal(
                        e->e_ocflags = 0;
                }
 
+               if ( glue_attr_delete ) {
+                       e->e_ocflags = 0;
+               }
+
                /* check if modified attribute was indexed
                 * but not in case of NOOP... */
                err = bdb_index_is_indexed( op->o_bd, mod->sm_desc );
@@ -307,8 +351,6 @@ bdb_modify( Operation *op, SlapReply *rs )
        u_int32_t       locker = 0;
        DB_LOCK         lock;
 
-       int             noop = 0;
-
        int             num_retries = 0;
 
        LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
@@ -488,9 +530,11 @@ retry:     /* transaction retry */
        }
 
        if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop && !op->o_no_psearch ) {
+               ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
                LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
                        bdb_psearch(op, rs, ps_list, e, LDAP_PSEARCH_BY_PREMODIFY );
                }
+               ldap_pvt_thread_rdwr_runlock( &bdb->bi_pslist_rwlock );
        }
 
        if( op->o_preread ) {
@@ -611,12 +655,10 @@ retry:    /* transaction retry */
                if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {
                        rs->sr_text = "txn_abort (no-op) failed";
                } else {
-                       noop = 1;
-                       rs->sr_err = LDAP_SUCCESS;
+                       rs->sr_err = LDAP_NO_OPERATION;
+                       goto return_results;
                }
        } else {
-               EntryInfo *ctx_ei;
-
                bdb_cache_modify( e, dummy.e_attrs, bdb->bi_dbenv, locker, &lock );
 
                if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
@@ -626,6 +668,24 @@ retry:     /* transaction retry */
                        }
                }
 
+               if ( rs->sr_err == LDAP_SUCCESS ) {
+                       /* Loop through in-scope entries for each psearch spec */
+                       ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
+                       LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+                               bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_MODIFY );
+                       }
+                       ldap_pvt_thread_rdwr_runlock( &bdb->bi_pslist_rwlock );
+                       pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
+                       while ( pm_list != NULL ) {
+                               bdb_psearch(op, rs, pm_list->ps_op,
+                                                       e, LDAP_PSEARCH_BY_SCOPEOUT);
+                               LDAP_LIST_REMOVE ( pm_list, ps_link );
+                               pm_prev = pm_list;
+                               pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
+                               ch_free( pm_prev );
+                       }
+               }
+
                rs->sr_err = TXN_COMMIT( ltid, 0 );
        }
        ltid = NULL;
@@ -667,22 +727,6 @@ retry:     /* transaction retry */
 return_results:
        send_ldap_result( op, rs );
 
-       if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
-               /* Loop through in-scope entries for each psearch spec */
-               LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
-                       bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_MODIFY );
-               }
-               pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
-               while ( pm_list != NULL ) {
-                       bdb_psearch(op, rs, pm_list->ps_op,
-                                               e, LDAP_PSEARCH_BY_SCOPEOUT);
-                       LDAP_LIST_REMOVE ( pm_list, ps_link );
-                       pm_prev = pm_list;
-                       pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
-                       ch_free( pm_prev );
-               }
-       }
-
        if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
                ldap_pvt_thread_yield();
                TXN_CHECKPOINT( bdb->bi_dbenv,
@@ -705,5 +749,5 @@ done:
        if( e != NULL ) {
                bdb_unlocked_cache_return_entry_w (&bdb->bi_cache, e);
        }
-       return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
+       return rs->sr_err;
 }