]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/add.c
Fix ITS#3255, boi_bdb comparisons
[openldap] / servers / slapd / back-bdb / add.c
index f8ebe4ec37251d7b40154e357b859f8a596a8fa0..6174a516167868d07a9399669df41b0ebf1dd65c 100644 (file)
@@ -1,8 +1,17 @@
 /* add.c - ldap BerkeleyDB back-end add 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"
@@ -18,7 +27,7 @@ bdb_add(Operation *op, SlapReply *rs )
 {
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        struct berval   pdn;
-       Entry           *p;
+       Entry           *p = NULL;
        EntryInfo       *ei;
        char textbuf[SLAP_TEXT_BUFLEN];
        size_t textlen = sizeof textbuf;
@@ -31,37 +40,37 @@ bdb_add(Operation *op, SlapReply *rs )
 #endif
        u_int32_t       locker = 0;
        DB_LOCK         lock;
-       int             noop = 0;
 
        int             num_retries = 0;
 
-#ifdef LDAP_SYNC
        Operation* ps_list;
-       struct berval *max_committed_csn = NULL;
+       int             rc;
        EntryInfo       *suffix_ei = NULL;
-       EntryInfo       *ctxcsn_ei = NULL;
-       Entry           *ctxcsn_e = NULL;
-       DB_LOCK         suffix_lock;
-       DB_LOCK         ctxcsn_lock;
-       struct berval ctxcsn_rdn = { 0, NULL };
-       struct berval ctxcsn_ndn = { 0, NULL };
-       int     rc, ret;
-       int             ctxcsn_added = 0;
-       ID              ctxcsn_id;
-#endif
+       Entry           *ctxcsn_e;
+       int                     ctxcsn_added = 0;
+
+       LDAPControl **postread_ctrl = NULL;
+       LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
+       int num_ctrls = 0;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", op->oq_add.rs_e->e_name.bv_val, 0, 0 );
+       LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n",
+               op->oq_add.rs_e->e_name.bv_val, 0, 0 );
 #else
-       Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", op->oq_add.rs_e->e_name.bv_val, 0, 0);
+       Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n",
+               op->oq_add.rs_e->e_name.bv_val, 0, 0);
 #endif
 
+       ctrls[num_ctrls] = 0;
+
        /* check entry's schema */
-       rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, NULL, &rs->sr_text, textbuf, textlen );
+       rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e,
+               NULL, &rs->sr_text, textbuf, textlen );
        if ( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ERR, 
-               "bdb_add: entry failed schema check: %s (%d)\n", rs->sr_text, rs->sr_err, 0 );
+               LDAP_LOG ( OPERATION, ERR, 
+                       "bdb_add: entry failed schema check: %s (%d)\n",
+                       rs->sr_text, rs->sr_err, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_add: entry failed schema check: %s (%d)\n",
@@ -92,24 +101,6 @@ bdb_add(Operation *op, SlapReply *rs )
                goto return_results;
        }
 
-#ifdef LDAP_SYNC
-       if ( be_issuffix( op->o_bd, &op->oq_add.rs_e->e_nname ) ) {
-               rs->sr_err = bdb_next_id( op->o_bd, NULL, &ctxcsn_id );
-               if( rs->sr_err != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, ERR, 
-                               "bdb_add: next_id failed (%d)\n", rs->sr_err, 0, 0 );
-#else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "bdb_add: next_id failed (%d)\n", rs->sr_err, 0, 0 );
-#endif
-                       rs->sr_err = LDAP_OTHER;
-                       rs->sr_text = "internal error";
-                       goto return_results;
-               }
-       }
-#endif
-
        if( 0 ) {
 retry: /* transaction retry */
                if( p ) {
@@ -126,8 +117,8 @@ retry:      /* transaction retry */
                        rs->sr_text = "internal error";
                        goto return_results;
                }
-               bdb_trans_backoff( ++num_retries );
                ldap_pvt_thread_yield();
+               bdb_trans_backoff( ++num_retries );
        }
 
        /* begin transaction */
@@ -137,7 +128,8 @@ retry:      /* transaction retry */
        if( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+                       "bdb_add: txn_begin failed: %s (%d)\n",
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_add: txn_begin failed: %s (%d)\n",
@@ -159,8 +151,6 @@ retry:      /* transaction retry */
        
        /*
         * Get the parent dn and see if the corresponding entry exists.
-        * If the parent does not exist, only allow the "root" user to
-        * add the entry.
         */
        if ( be_issuffix( op->o_bd, &op->oq_add.rs_e->e_nname ) ) {
                pdn = slap_empty_bv;
@@ -200,8 +190,8 @@ retry:      /* transaction retry */
                        bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
                        p = NULL;
 #ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, DETAIL1, 
-                               "bdb_add: parent does not exist\n", 0, 0, 0 );
+                       LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: parent does not exist\n",
+                               0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n",
                                0, 0, 0 );
@@ -232,8 +222,8 @@ retry:      /* transaction retry */
                        LDAP_LOG ( OPERATION, DETAIL1, 
                                "bdb_add: no write access to parent\n", 0, 0, 0 );
 #else
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n",
-                               0, 0, 0 );
+                       Debug( LDAP_DEBUG_TRACE,
+                               "bdb_add: no write access to parent\n", 0, 0, 0 );
 #endif
                        rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                        rs->sr_text = "no write access to parent";
@@ -309,72 +299,22 @@ retry:    /* transaction retry */
        } else {
                /*
                 * no parent!
-                *      must be adding entry at suffix or with parent ""
+                *  if not attempting to add entry at suffix or with parent ""
                 */
-               if ( !be_isroot( op->o_bd, &op->o_ndn )) {
-                       if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv )
-                               || be_isupdate( op->o_bd, &op->o_ndn ) )
-                       {
-                               p = (Entry *)&slap_entry_root;
-
-                               /* check parent for "children" acl */
-                               rs->sr_err = access_allowed( op, p,
-                                       children, NULL, ACL_WRITE, NULL );
-
-                               p = NULL;
-
-                               if ( ! rs->sr_err ) {
-                                       switch( opinfo.boi_err ) {
-                                       case DB_LOCK_DEADLOCK:
-                                       case DB_LOCK_NOTGRANTED:
-                                               goto retry;
-                                       }
-
-#ifdef NEW_LOGGING
-                                       LDAP_LOG ( OPERATION, DETAIL1, 
-                                               "bdb_add: no write access to parent\n", 0, 0, 0 );
-#else
-                                       Debug( LDAP_DEBUG_TRACE,
-                                               "bdb_add: no write access to parent\n",
-                                               0, 0, 0 );
-#endif
-                                       rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
-                                       rs->sr_text = "no write access to parent";
-                                       goto return_results;
-                               }
-#ifdef LDAP_SYNCREPL
-                       } else if ( !is_entry_glue( op->oq_add.rs_e )) {
-#else
-                       } else {
-#endif
-#ifdef NEW_LOGGING
-                               LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: %s denied\n", 
-                                       pdn.bv_len == 0 ? "suffix" : "entry at root", 0, 0 );
-#else
-                               Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n",
-                                       pdn.bv_len == 0 ? "suffix" : "entry at root",
-                                       0, 0 );
-#endif
-                               rs->sr_err = LDAP_NO_SUCH_OBJECT;
-                               goto return_results;
-                       }
-               }
-
-#ifdef BDB_SUBENTRIES
-               if( subentry ) {
+               if ((( !be_isroot( op ) && !be_shadow_update(op) )
+                       || pdn.bv_len > 0 ) && !is_entry_glue( op->oq_add.rs_e ))
+               {
 #ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, DETAIL1, 
-                               "bdb_add: no parent, cannot add subentry\n", 0, 0, 0 );
+                       LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: %s denied\n", 
+                               pdn.bv_len == 0 ? "suffix" : "entry at root", 0, 0 );
 #else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "bdb_add: no parent, cannot add subentry\n",
-                               0, 0, 0 );
+                       Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n",
+                               pdn.bv_len == 0 ? "suffix" : "entry at root",
+                               0, 0 );
 #endif
                        rs->sr_err = LDAP_NO_SUCH_OBJECT;
-                       rs->sr_text = "no parent, cannot add subentry";
                        goto return_results;
                }
-#endif
        }
 
        if ( get_assert( op ) &&
@@ -414,7 +354,8 @@ retry:      /* transaction retry */
        if( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_add: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+                       "bdb_add: txn_begin(2) failed: %s (%d)\n",
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_add: txn_begin(2) failed: %s (%d)\n",
@@ -430,7 +371,8 @@ retry:      /* transaction retry */
        if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+                       "bdb_add: dn2id_add failed: %s (%d)\n",
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
                        db_strerror(rs->sr_err), rs->sr_err, 0 );
@@ -495,219 +437,128 @@ retry:  /* transaction retry */
                goto return_results;
        }
 
-#ifdef LDAP_SYNC
-       ber_str2bv( "cn=ldapsync", strlen("cn=ldapsync"), 0, &ctxcsn_rdn );
-       build_new_dn( &ctxcsn_ndn, &op->o_bd->be_nsuffix[0], &ctxcsn_rdn );
-
-       rc = bdb_dn2entry( op, ltid, &ctxcsn_ndn, &ctxcsn_ei,
-                                                          0, locker, &ctxcsn_lock );
-
-       if ( ctxcsn_ei ) {
-               ctxcsn_e = ctxcsn_ei->bei_e;
-               bdb_cache_entry_db_relock( bdb->bi_dbenv, locker, ctxcsn_ei, 1, 0, &ctxcsn_lock );
-       }
-
-       max_committed_csn = commit_csn( op );
-
-       ctxcsn_added = 0;
-
-       if ( max_committed_csn == NULL )
-               goto txn_end;
-
-       switch( rc ) {
-       case 0:
-               if ( !ctxcsn_e ) {
-                       rs->sr_err = LDAP_OTHER;
-                       rs->sr_text = "context csn not present";
+       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;
-               } else {
-                       attr_delete( &ctxcsn_e->e_attrs, slap_schema.si_ad_contextCSN );
-                       attr_merge_normalize_one( ctxcsn_e, slap_schema.si_ad_contextCSN,
-                                                       max_committed_csn, NULL );
-                       ret = bdb_id2entry_update( op->o_bd, ltid, ctxcsn_e );
-                       switch ( ret ) {
-                       case 0 :
-                               break;
-                       case DB_LOCK_DEADLOCK :
-                       case DB_LOCK_NOTGRANTED :
-                               goto rewind;
-                       default :
-                               rs->sr_err = ret;
-                               rs->sr_text = "context csn update failed";
-                               goto return_results;
-                       }
-                       ret = bdb_index_entry_add( op, ltid, ctxcsn_e );
-                       switch ( ret ) {
-                       case 0 :
-                               break;
-                       case DB_LOCK_DEADLOCK :
-                       case DB_LOCK_NOTGRANTED :
-                               goto rewind;
-                       default :
-                               rs->sr_err = LDAP_OTHER;
-                               rs->sr_text = "context csn indexing failed";
-                               goto return_results;
-                       }
-               }
-               break;
-       case DB_NOTFOUND:
-               if ( !be_issuffix( op->o_bd, &op->ora_e->e_nname ) ) {
-                       rc = bdb_dn2entry( op, ltid, &op->o_bd->be_nsuffix[0], &suffix_ei,
-                                                                          0, locker, &suffix_lock );
-               } else {
-                       suffix_ei = ei;
+               case BDB_CSN_RETRY :
+                       goto retry;
                }
+       }
 
-               ctxcsn_e = create_context_csn_entry( op->o_bd, max_committed_csn );
-               ctxcsn_e->e_id = ctxcsn_id;
-               ctxcsn_added = 1;
-               ret = bdb_dn2id_add( op, ltid, suffix_ei, ctxcsn_e );
-               switch ( ret ) {
-               case 0 :
-                       break;
-               case DB_LOCK_DEADLOCK :
-               case DB_LOCK_NOTGRANTED :
-                       goto rewind;
-               case DB_KEYEXIST :
-                       rs->sr_err = LDAP_OTHER;
-                       rs->sr_text = "context csn exists before contex prefix does";
-                       goto return_results;
-               default :
-                       rs->sr_err = LDAP_OTHER;
-                       rs->sr_text = "context csn store failed";
-                       goto return_results;
-               }
-               ret = bdb_id2entry_add( op->o_bd, ltid, ctxcsn_e );
-               switch ( ret ) {
-               case 0 :
-                       break;
-               case DB_LOCK_DEADLOCK :
-               case DB_LOCK_NOTGRANTED :
-                       goto rewind;
-               default :
-                       rs->sr_err = LDAP_OTHER;
-                       rs->sr_text = "context csn store failed";
-                       goto return_results;
+       /* post-read */
+       if( op->o_postread ) {
+               if( postread_ctrl == NULL ) {
+                       postread_ctrl = &ctrls[num_ctrls++];
+                       ctrls[num_ctrls] = NULL;
                }
-               ret = bdb_index_entry_add( op, ltid, ctxcsn_e );
-               switch ( ret ) {
-               case 0 :
-                       break;
-               case DB_LOCK_DEADLOCK :
-               case DB_LOCK_NOTGRANTED :
-                       goto rewind;
-               default :
-                       rs->sr_err = LDAP_OTHER;
-                       rs->sr_text = "context csn indexing failed";
+               if ( slap_read_controls( op, rs, op->oq_add.rs_e,
+                       &slap_post_read_bv, postread_ctrl ) )
+               {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( OPERATION, DETAIL1, 
+                               "<=- bdb_add: post-read failed!\n", 0, 0, 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "<=- bdb_add: post-read failed!\n", 0, 0, 0 );
+#endif
                        goto return_results;
                }
-               break;
-       case DB_LOCK_DEADLOCK:
-       case DB_LOCK_NOTGRANTED:
-               goto rewind;
-       case LDAP_BUSY:
-               rs->sr_err = rc;
-               rs->sr_text = "ldap server busy";
-               goto return_results;
-       default:
-               rs->sr_err = LDAP_OTHER;
-               rs->sr_text = "internal error";
-               goto return_results;
        }
 
-       goto txn_end;
-
-rewind :
-       rewind_commit_csn( op );
-       goto retry;
-
-txn_end:
-#endif
-
        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;
+                       rs->sr_err = LDAP_NO_OPERATION;
+                       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";
+               struct berval nrdn;
+               Entry *e = entry_dup( op->ora_e );
 
+               if (pdn.bv_len) {
+                       nrdn.bv_val = e->e_nname.bv_val;
+                       nrdn.bv_len = pdn.bv_val - op->ora_e->e_nname.bv_val - 1;
                } else {
-                       struct berval nrdn;
-#ifdef LDAP_SYNC
-                       struct berval ctx_nrdn;
-#endif
+                       nrdn = e->e_nname;
+               }
 
-                       if (pdn.bv_len) {
-                               nrdn.bv_val = op->ora_e->e_nname.bv_val;
-                               nrdn.bv_len = pdn.bv_val - nrdn.bv_val - 1;
-                       } else {
-                               nrdn = op->ora_e->e_nname;
-                       }
+               bdb_cache_add( bdb, ei, e, &nrdn, locker );
 
-                       bdb_cache_add( bdb, ei, op->oq_add.rs_e, &nrdn, locker );
+               if ( suffix_ei == NULL ) {
+                       suffix_ei = BEI(e);
+               }
 
-#ifdef LDAP_SYNC
+               if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
                        if ( ctxcsn_added ) {
-                               ctx_nrdn.bv_val = "cn=ldapsync";
-                               ctx_nrdn.bv_len = strlen( ctx_nrdn.bv_val );
-                               bdb_cache_add( bdb, suffix_ei, ctxcsn_e, &ctx_nrdn, locker );
+                               bdb_cache_add( bdb, suffix_ei, ctxcsn_e,
+                                       (struct berval *)&slap_ldapsync_cn_bv, locker );
                        }
-#endif
+               }
 
-                       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 == LDAP_SUCCESS && !op->o_no_psearch ) {
+                       ldap_pvt_thread_rdwr_wlock( &bdb->bi_pslist_rwlock );
+                       assert( BEI(e) );
+                       LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+                               rc = bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_ADD );
+                               if ( rc ) {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG ( OPERATION, ERR, 
+                                               "bdb_add: persistent search failed (%d,%d)\n",
+                                               rc, rs->sr_err, 0 );
+#else
+                                       Debug( LDAP_DEBUG_TRACE,
+                                               "bdb_add: persistent search failed (%d,%d)\n",
+                                               rc, rs->sr_err, 0 );
+#endif
+                               }
                        }
+                       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;
                }
        }
 
        ltid = NULL;
        op->o_private = NULL;
 
-       if (rs->sr_err == LDAP_SUCCESS) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS, 
-                       "bdb_add: added%s id=%08lx dn=\"%s\"\n", 
-                       op->o_noop ? " (no-op)" : "", op->oq_add.rs_e->e_id, op->oq_add.rs_e->e_dn );
-#else
-               Debug(LDAP_DEBUG_TRACE, "bdb_add: added%s id=%08lx dn=\"%s\"\n",
-                       op->o_noop ? " (no-op)" : "", op->oq_add.rs_e->e_id, op->oq_add.rs_e->e_dn );
-#endif
-               rs->sr_text = NULL;
-       }
-       else {
+       if ( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_add: %s : %s (%d)\n",  rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
+               LDAP_LOG ( OPERATION, ERR, "bdb_add: %s : %s (%d)\n",
+                       rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
 #else
                Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n",
                        rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
 #endif
                rs->sr_err = LDAP_OTHER;
+               goto return_results;
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, RESULTS, 
+               "bdb_add: added%s id=%08lx dn=\"%s\"\n", 
+               op->o_noop ? " (no-op)" : "",
+               op->oq_add.rs_e->e_id, op->oq_add.rs_e->e_dn );
+#else
+       Debug(LDAP_DEBUG_TRACE, "bdb_add: added%s id=%08lx dn=\"%s\"\n",
+               op->o_noop ? " (no-op)" : "",
+               op->oq_add.rs_e->e_id, op->oq_add.rs_e->e_dn );
+#endif
+
+       rs->sr_text = NULL;
+       if( num_ctrls ) rs->sr_ctrls = ctrls;
+
 return_results:
        send_ldap_result( op, rs );
 
-#ifdef LDAP_SYNC
-       if ( rs->sr_err == LDAP_SUCCESS && !noop ) {
-               LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
-                       bdb_psearch( op, rs, ps_list, op->oq_add.rs_e, LDAP_PSEARCH_BY_ADD );
-               }
-       }
-#endif
-
        if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
                ldap_pvt_thread_yield();
                TXN_CHECKPOINT( bdb->bi_dbenv,
@@ -715,11 +566,14 @@ return_results:
        }
 
 done:
-
        if( ltid != NULL ) {
                TXN_ABORT( ltid );
                op->o_private = NULL;
        }
 
-       return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
+       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;
 }