]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/modrdn.c
silence warning
[openldap] / servers / slapd / back-bdb / modrdn.c
index 861a425a7600ef79473e1d9571835618fc19e0e0..0956d8cdfd01a903432ed0f85b3c0a6b09d39f88 100644 (file)
@@ -1,8 +1,17 @@
 /* modrdn.c - bdb backend modrdn routine */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -32,7 +41,7 @@ bdb_modrdn( Operation *op, SlapReply *rs )
        size_t textlen = sizeof textbuf;
        DB_TXN          *ltid = NULL, *lt2;
        struct bdb_op_info opinfo;
-       Entry dummy, *save;
+       Entry dummy = {0};
 
        ID                      id;
 
@@ -49,10 +58,10 @@ bdb_modrdn( Operation       *op, SlapReply *rs )
        u_int32_t       locker = 0;
        DB_LOCK         lock, plock, nplock;
 
-       int             noop = 0;
-
        int             num_retries = 0;
 
+       LDAPControl **preread_ctrl = NULL;
+       LDAPControl **postread_ctrl = NULL;
        LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
        int num_ctrls = 0;
 
@@ -63,6 +72,11 @@ bdb_modrdn( Operation        *op, SlapReply *rs )
        Entry           *ctxcsn_e;
        int                     ctxcsn_added = 0;
 
+       int parent_is_glue = 0;
+       int parent_is_leaf = 0;
+
+       ctrls[num_ctrls] = NULL;
+
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ENTRY, "==>bdb_modrdn(%s,%s,%s)\n", 
                op->o_req_dn.bv_val,op->oq_modrdn.rs_newrdn.bv_val,
@@ -75,6 +89,10 @@ bdb_modrdn( Operation        *op, SlapReply *rs )
 
        if( 0 ) {
 retry: /* transaction retry */
+               if ( dummy.e_attrs ) {
+                       attrs_free( dummy.e_attrs );
+                       dummy.e_attrs = NULL;
+               }
                if (e != NULL) {
                        bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
                        e = NULL;
@@ -92,7 +110,6 @@ retry:       /* transaction retry */
 #else
                Debug( LDAP_DEBUG_TRACE, "==>bdb_modrdn: retrying...\n", 0, 0, 0 );
 #endif
-
                pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
                while ( pm_list != NULL ) {
                        LDAP_LIST_REMOVE ( pm_list, ps_link );
@@ -110,8 +127,10 @@ retry:     /* transaction retry */
                        rs->sr_text = "internal error";
                        goto return_results;
                }
-               bdb_trans_backoff( ++num_retries );
+               parent_is_glue = 0;
+               parent_is_leaf = 0;
                ldap_pvt_thread_yield();
+               bdb_trans_backoff( ++num_retries );
        }
 
        /* begin transaction */
@@ -164,7 +183,9 @@ retry:      /* transaction retry */
 
        e = ei->bei_e;
        /* FIXME: dn2entry() should return non-glue entry */
-       if (( rs->sr_err == DB_NOTFOUND ) || ( !manageDSAit && e && is_entry_glue( e ))) {
+       if (( rs->sr_err == DB_NOTFOUND ) ||
+               ( !manageDSAit && e && is_entry_glue( e )))
+       {
                if( e != NULL ) {
                        rs->sr_matched = ch_strdup( e->e_dn );
                        rs->sr_ref = is_entry_referral( e )
@@ -174,9 +195,19 @@ retry:     /* transaction retry */
                        e = NULL;
 
                } else {
-                       BerVarray deref = op->o_bd->syncinfo ?
-                                                         op->o_bd->syncinfo->provideruri_bv : default_referral;
-                       rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
+                       BerVarray deref = NULL;
+                       if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
+                               syncinfo_t *si;
+                               LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
+                                       struct berval tmpbv;
+                                       ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
+                                       ber_bvarray_add( &deref, &tmpbv );
+                }
+                       } else {
+                               deref = default_referral;
+                       }
+                       rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
+                               LDAP_SCOPE_DEFAULT );
                }
 
                rs->sr_err = LDAP_REFERRAL;
@@ -254,6 +285,7 @@ retry:      /* transaction retry */
        }
        ei->bei_state |= CACHE_ENTRY_NO_KIDS;
 #endif
+
        if (!manageDSAit && is_entry_referral( e ) ) {
                /* parent is a referral, don't allow add */
                rs->sr_ref = get_entry_referrals( op, e );
@@ -369,10 +401,10 @@ retry:    /* transaction retry */
 
        } else {
                /* no parent, modrdn entry directly under root */
-               isroot = be_isroot( op->o_bd, &op->o_ndn );
+               isroot = be_isroot( op );
                if ( ! isroot ) {
                        if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv )
-                               || be_isupdate( op->o_bd, &op->o_ndn ) ) {
+                               || be_shadow_update( op ) ) {
 
                                p = (Entry *)&slap_entry_root;
 
@@ -579,7 +611,7 @@ retry:      /* transaction retry */
 
                } else {
                        if ( isroot == -1 ) {
-                               isroot = be_isroot( op->o_bd, &op->o_ndn );
+                               isroot = be_isroot( op );
                        }
                        
                        np_dn = NULL;
@@ -587,7 +619,7 @@ retry:      /* transaction retry */
                        /* no parent, modrdn entry directly under root */
                        if ( ! isroot ) {
                                if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv )
-                                       || be_isupdate( op->o_bd, &op->o_ndn ) ) {
+                                       || be_isupdate( op ) ) {
                                        np = (Entry *)&slap_entry_root;
 
                                        /* check parent for "children" acl */
@@ -612,7 +644,8 @@ retry:      /* transaction retry */
                                                        "no access to new superior\n", 
                                                        0, 0, 0 );
 #endif
-                                               rs->sr_text = "no write access to new superior's children";
+                                               rs->sr_text =
+                                                       "no write access to new superior's children";
                                                goto return_results;
                                        }
 
@@ -665,7 +698,9 @@ retry:      /* transaction retry */
        }
 
        /* Build target dn and make sure target entry doesn't exist already. */
-       if (!new_dn.bv_val) build_new_dn( &new_dn, new_parent_dn, &op->oq_modrdn.rs_newrdn ); 
+       if (!new_dn.bv_val) {
+               build_new_dn( &new_dn, new_parent_dn, &op->oq_modrdn.rs_newrdn, NULL ); 
+       }
 
        if (!new_ndn.bv_val) {
                struct berval bv = {0, NULL};
@@ -681,10 +716,9 @@ retry:     /* transaction retry */
                new_ndn.bv_val, 0, 0 );
 #endif
 
-
        /* Shortcut the search */
        nei = neip ? neip : eip;
-       rs->sr_err = bdb_cache_find_ndn ( op, ltid, &new_ndn, &nei, locker );
+       rs->sr_err = bdb_cache_find_ndn ( op, ltid, &new_ndn, &nei );
        if ( nei ) bdb_cache_entryinfo_unlock( nei );
        switch( rs->sr_err ) {
        case DB_LOCK_DEADLOCK:
@@ -704,8 +738,8 @@ retry:      /* transaction retry */
        /* Get attribute type and attribute value of our new rdn, we will
         * need to add that to our new entry
         */
-       if ( !new_rdn && ldap_bv2rdn_x( &op->oq_modrdn.rs_newrdn, &new_rdn, (char **)&rs->sr_text,
-               LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) )
+       if ( !new_rdn && ldap_bv2rdn_x( &op->oq_modrdn.rs_newrdn, &new_rdn,
+               (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) )
        {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
@@ -725,21 +759,17 @@ retry:    /* transaction retry */
 
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, RESULTS, 
-               "bdb_modrdn: new_rdn_type=\"%s\", "
-               "new_rdn_val=\"%s\"\n",
-               new_rdn[ 0 ]->la_attr.bv_val, 
-               new_rdn[ 0 ]->la_value.bv_val, 0 );
+               "bdb_modrdn: new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n",
+               new_rdn[ 0 ]->la_attr.bv_val, new_rdn[ 0 ]->la_value.bv_val, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE,
-               "bdb_modrdn: new_rdn_type=\"%s\", "
-               "new_rdn_val=\"%s\"\n",
-               new_rdn[ 0 ]->la_attr.bv_val,
-               new_rdn[ 0 ]->la_value.bv_val, 0 );
+               "bdb_modrdn: new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n",
+               new_rdn[ 0 ]->la_attr.bv_val, new_rdn[ 0 ]->la_value.bv_val, 0 );
 #endif
 
        if ( op->oq_modrdn.rs_deleteoldrdn ) {
-               if ( !old_rdn && ldap_bv2rdn_x( &op->o_req_dn, &old_rdn, (char **)&rs->sr_text,
-                       LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) )
+               if ( !old_rdn && ldap_bv2rdn_x( &op->o_req_dn, &old_rdn,
+                       (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) )
                {
 #ifdef NEW_LOGGING
                        LDAP_LOG ( OPERATION, ERR, 
@@ -767,8 +797,12 @@ retry:     /* transaction retry */
        }
 
        if( op->o_preread ) {
+               if( preread_ctrl == NULL ) {
+                       preread_ctrl = &ctrls[num_ctrls++];
+                       ctrls[num_ctrls] = NULL;
+               }
                if( slap_read_controls( op, rs, e,
-                       &slap_pre_read_bv, &ctrls[num_ctrls] ) )
+                       &slap_pre_read_bv, preread_ctrl ) )
                {
 #ifdef NEW_LOGGING                                   
                        LDAP_LOG ( OPERATION, DETAIL1,
@@ -779,18 +813,16 @@ retry:    /* transaction retry */
 #endif
                        goto return_results;
                }                   
-               ctrls[++num_ctrls] = NULL;
-               op->o_preread = 0;  /* prevent redo on retry */
        }
 
        /* nested transaction */
-       rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
-               bdb->bi_db_opflags );
+       rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, bdb->bi_db_opflags );
        rs->sr_text = NULL;
        if( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_modrdn: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+                       "bdb_modrdn: txn_begin(2) failed: %s (%d)\n",
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modrdn: txn_begin(2) failed: %s (%d)\n",
@@ -801,11 +833,7 @@ retry:     /* transaction retry */
                goto return_results;
        }
 
-       dummy = *e;
-       save = e;
-       e = &dummy;
-
-       /* delete old one */
+       /* delete old DN */
        rs->sr_err = bdb_dn2id_delete( op, lt2, eip, e );
        if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
@@ -827,23 +855,14 @@ retry:    /* transaction retry */
                goto return_results;
        }
 
-       /* Binary format uses a single contiguous block, cannot
-        * free individual fields. But if a previous modrdn has
-        * already happened, must free the names. The frees are
-        * done in bdb_cache_modrdn().
-        */
-       if( e->e_nname.bv_val < e->e_bv.bv_val || e->e_nname.bv_val >
-               e->e_bv.bv_val + e->e_bv.bv_len ) {
-               e->e_name.bv_val = NULL;
-               e->e_nname.bv_val = NULL;
-       }
-       e->e_name = new_dn;
-       e->e_nname = new_ndn;
-       new_dn.bv_val = NULL;
-       new_ndn.bv_val = NULL;
+       /* copy the entry, then override some fields */
+       dummy = *e;
+       dummy.e_name = new_dn;
+       dummy.e_nname = new_ndn;
+       dummy.e_attrs = NULL;
 
-       /* add new one */
-       rs->sr_err = bdb_dn2id_add( op, lt2, neip ? neip : eip, e );
+       /* add new DN */
+       rs->sr_err = bdb_dn2id_add( op, lt2, neip ? neip : eip, &dummy );
        if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
@@ -864,16 +883,31 @@ retry:    /* transaction retry */
                goto return_results;
        }
 
-       if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
+       dummy.e_attrs = e->e_attrs;
+
+       if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop && !op->o_no_psearch ) {
+               ldap_pvt_thread_rdwr_wlock( &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 );
+                       rc = bdb_psearch( op, rs, ps_list, &dummy, LDAP_PSEARCH_BY_PREMODIFY );
+                       if ( rc ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG ( OPERATION, ERR,
+                                       "bdb_modrdn: persistent search failed (%d,%d)\n",
+                                       rc, rs->sr_err, 0 );
+#else
+                               Debug( LDAP_DEBUG_TRACE,
+                                       "bdb_modrdn: persistent search failed (%d,%d)\n",
+                                       rc, rs->sr_err, 0 );
+#endif
+                       }
                }
+               ldap_pvt_thread_rdwr_wunlock( &bdb->bi_pslist_rwlock );
        }
 
+
        /* modify entry */
-       rs->sr_err = bdb_modify_internal( op, lt2, &mod[0], e,
+       rs->sr_err = bdb_modify_internal( op, lt2, &mod[0], &dummy,
                &rs->sr_text, textbuf, textlen );
-
        if( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
@@ -887,6 +921,7 @@ retry:      /* transaction retry */
                if ( ( rs->sr_err == LDAP_INSUFFICIENT_ACCESS ) && opinfo.boi_err ) {
                        rs->sr_err = opinfo.boi_err;
                }
+               if ( dummy.e_attrs == e->e_attrs ) dummy.e_attrs = NULL;
                switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
@@ -895,26 +930,8 @@ retry:     /* transaction retry */
                goto return_results;
        }
 
-       if( op->o_postread ) {
-               if( slap_read_controls( op, rs, e,
-                       &slap_post_read_bv, &ctrls[num_ctrls] ) )
-               {
-#ifdef NEW_LOGGING                                   
-                       LDAP_LOG ( OPERATION, DETAIL1,
-                               "<=- bdb_modrdn: post-read failed!\n", 0, 0, 0 );
-#else
-                       Debug( LDAP_DEBUG_TRACE,        
-                               "<=- bdb_modrdn: post-read failed!\n", 0, 0, 0 );
-#endif
-                       goto return_results;
-               }                   
-               ctrls[++num_ctrls] = NULL;
-               op->o_postread = 0;  /* prevent redo on retry */
-               /* FIXME: should read entry on the last retry */
-       }
-
        /* id2entry index */
-       rs->sr_err = bdb_id2entry_update( op->o_bd, lt2, e );
+       rs->sr_err = bdb_id2entry_update( op->o_bd, lt2, &dummy );
        if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
@@ -934,14 +951,46 @@ retry:    /* transaction retry */
                rs->sr_text = "entry update failed";
                goto return_results;
        }
+
+       if ( p_ndn.bv_len != 0 ) {
+               parent_is_glue = is_entry_glue(p);
+               rs->sr_err = bdb_cache_children( op, lt2, p );
+               if ( rs->sr_err != DB_NOTFOUND ) {
+                       switch( rs->sr_err ) {
+                       case DB_LOCK_DEADLOCK:
+                       case DB_LOCK_NOTGRANTED:
+                               goto retry;
+                       case 0:
+                               break;
+                       default:
+#ifdef NEW_LOGGING
+                               LDAP_LOG ( OPERATION, ERR,
+                                       "<=- bdb_modrdn: has_children failed %s (%d)\n",
+                                       db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+                               Debug(LDAP_DEBUG_ARGS,
+                                       "<=- bdb_modrdn: has_children failed: %s (%d)\n",
+                                       db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+                               rs->sr_err = LDAP_OTHER;
+                               rs->sr_text = "internal error";
+                               goto return_results;
+                       }
+                       parent_is_leaf = 1;
+               }
+               bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, p);
+               p = NULL;
+       }
+
        if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "txn_commit(2) failed";
                goto return_results;
        }
 
-       if ( !op->o_bd->syncinfo ) {
-               rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei, &ctxcsn_e, &ctxcsn_added, locker );
+       if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
+               rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei,
+                       &ctxcsn_e, &ctxcsn_added, locker );
                switch ( rc ) {
                case BDB_CSN_ABORT :
                        goto return_results;
@@ -950,37 +999,96 @@ retry:    /* transaction retry */
                }
        }
 
+       if( op->o_postread ) {
+               if( postread_ctrl == NULL ) {
+                       postread_ctrl = &ctrls[num_ctrls++];
+                       ctrls[num_ctrls] = NULL;
+               }
+               if( slap_read_controls( op, rs, &dummy,
+                       &slap_post_read_bv, postread_ctrl ) )
+               {
+#ifdef NEW_LOGGING                                   
+                       LDAP_LOG ( OPERATION, DETAIL1,
+                               "<=- bdb_modrdn: post-read failed!\n", 0, 0, 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE,        
+                               "<=- bdb_modrdn: post-read failed!\n", 0, 0, 0 );
+#endif
+                       goto return_results;
+               }                   
+       }
+
        if( op->o_noop ) {
                if(( rs->sr_err=TXN_ABORT( ltid )) != 0 ) {
                        rs->sr_text = "txn_abort (no-op) failed";
                } else {
-                       noop = 1;
                        rs->sr_err = LDAP_SUCCESS;
+                       goto return_results;
                }
 
        } else {
-               char gid[DB_XIDDATASIZE];
-
-               snprintf( gid, sizeof( gid ), "%s-%08lx-%08lx",
-                       bdb_uuid.bv_val, (long) op->o_connid, (long) op->o_opid );
-
-               if(( rs->sr_err=TXN_PREPARE( ltid, gid )) != 0 ) {
-                       rs->sr_text = "txn_prepare failed";
-               } else {
-                       bdb_cache_modrdn( save, &op->orr_nnewrdn, e, neip,
-                               bdb->bi_dbenv, locker, &lock );
+               rc = bdb_cache_modrdn( e, &op->orr_nnewrdn, &dummy, neip,
+                       bdb->bi_dbenv, locker, &lock );
+               switch( rc ) {
+               case DB_LOCK_DEADLOCK:
+               case DB_LOCK_NOTGRANTED:
+                       goto retry;
+               }
+               dummy.e_attrs = NULL;
+               new_dn.bv_val = NULL;
+               new_ndn.bv_val = NULL;
+
+               if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
+                       if ( ctxcsn_added ) {
+                               bdb_cache_add( bdb, suffix_ei, ctxcsn_e,
+                                       (struct berval *)&slap_ldapsync_cn_bv, locker );
+                       }
+               }
 
-                       if ( !op->o_bd->syncinfo ) {
-                               if ( ctxcsn_added ) {
-                                       bdb_cache_add( bdb, suffix_ei, ctxcsn_e, (struct berval *)&slap_ldapsync_cn_bv, locker );
+               if ( rs->sr_err == LDAP_SUCCESS ) {
+                       /* Loop through in-scope entries for each psearch spec */
+                       ldap_pvt_thread_rdwr_wlock( &bdb->bi_pslist_rwlock );
+                       LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+                               rc = bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_MODIFY );
+                               if ( rc ) {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG ( OPERATION, ERR,
+                                               "bdb_modrdn: persistent search failed (%d,%d)\n",
+                                               rc, rs->sr_err, 0 );
+#else
+                                       Debug( LDAP_DEBUG_TRACE,
+                                               "bdb_modrdn: persistent search failed (%d,%d)\n",
+                                               rc, rs->sr_err, 0 );
+#endif
+                       }
+                       }
+                       pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
+                       while ( pm_list != NULL ) {
+                               rc = bdb_psearch(op, rs, pm_list->ps_op,
+                                                       e, LDAP_PSEARCH_BY_SCOPEOUT);
+                               if ( rc ) {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG ( OPERATION, ERR,
+                                               "bdb_modrdn: persistent search failed (%d,%d)\n",
+                                               rc, rs->sr_err, 0 );
+#else
+                                       Debug( LDAP_DEBUG_TRACE,
+                                               "bdb_modrdn: persistent search failed (%d,%d)\n",
+                                               rc, rs->sr_err, 0 );
+#endif
                                }
+                               pm_prev = pm_list;
+                               LDAP_LIST_REMOVE ( pm_list, ps_link );
+                               pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
+                               ch_free( pm_prev );
                        }
+                       ldap_pvt_thread_rdwr_wunlock( &bdb->bi_pslist_rwlock );
+               }
 
-                       if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
-                               rs->sr_text = "txn_commit failed";
-                       } else {
-                               rs->sr_err = LDAP_SUCCESS;
-                       }
+               if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
+                       rs->sr_text = "txn_commit failed";
+               } else {
+                       rs->sr_err = LDAP_SUCCESS;
                }
        }
  
@@ -1003,39 +1111,32 @@ retry:  /* transaction retry */
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, RESULTS, 
                "bdb_modrdn: rdn modified%s id=%08lx dn=\"%s\"\n", 
-               op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+               op->o_noop ? " (no-op)" : "",
+               e->e_id, e->e_dn );
 #else
        Debug(LDAP_DEBUG_TRACE,
                "bdb_modrdn: rdn modified%s id=%08lx dn=\"%s\"\n",
-               op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+               op->o_noop ? " (no-op)" : "",
+               e->e_id, e->e_dn );
 #endif
        rs->sr_text = NULL;
        if( num_ctrls ) rs->sr_ctrls = ctrls;
 
 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);
-                       pm_prev = pm_list;
-                       LDAP_LIST_REMOVE ( pm_list, ps_link );
-                       pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
-                       ch_free( pm_prev );
-               }
+       if ( dummy.e_attrs ) {
+               attrs_free( dummy.e_attrs );
        }
+       send_ldap_result( op, rs );
 
        if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
                ldap_pvt_thread_yield();
                TXN_CHECKPOINT( bdb->bi_dbenv,
                        bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
        }
+       
+       if ( rs->sr_err == LDAP_SUCCESS && parent_is_glue && parent_is_leaf ) {
+               op->o_delete_glue_parent = 1;
+       }
 
 done:
        if( new_dn.bv_val != NULL ) free( new_dn.bv_val );
@@ -1052,9 +1153,15 @@ done:
                Modifications *tmp;
                for (; mod; mod=tmp ) {
                        tmp = mod->sml_next;
+                       /* slap_modrdn2mods does things one way,
+                        * slap_mods_opattrs does it differently
+                        */
+                       if ( mod->sml_op != SLAP_MOD_SOFTADD &&
+                               mod->sml_op != LDAP_MOD_DELETE ) break;
                        if ( mod->sml_nvalues ) free( mod->sml_nvalues[0].bv_val );
                        free( mod );
                }
+               slap_mods_free( mod );
        }
 
        /* LDAP v3 Support */
@@ -1085,5 +1192,13 @@ done:
                op->o_private = NULL;
        }
 
-       return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
+       if( preread_ctrl != NULL ) {
+               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
+               slap_sl_free( *preread_ctrl, &op->o_tmpmemctx );
+       }
+       if( postread_ctrl != NULL ) {
+               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
+               slap_sl_free( *postread_ctrl, &op->o_tmpmemctx );
+       }
+       return rs->sr_err;
 }