Sync with HEAD

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

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index b3935fb187d00583740ce18dfac2661210a563ea..3a1f6942f44c8194775383d8c783daf4f6582f55 100644 (file)
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@ bdb_add(Operation *op, SlapReply *rs )
        AttributeDescription *children = slap_schema.si_ad_children;
        AttributeDescription *entry = slap_schema.si_ad_entry;
        DB_TXN          *ltid = NULL, *lt2;
-       struct bdb_op_info opinfo;
+       struct bdb_op_info opinfo = {0};
 #ifdef BDB_SUBENTRIES
        int subentry;
 #endif
@@ -52,7 +52,7 @@ bdb_add(Operation *op, SlapReply *rs )
        LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
        int num_ctrls = 0;
 
-       Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n",
+       Debug(LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_add) ": %s\n",
                op->oq_add.rs_e->e_name.bv_val, 0, 0);
 
        ctrls[num_ctrls] = 0;
@@ -62,8 +62,8 @@ bdb_add(Operation *op, SlapReply *rs )
                NULL, &rs->sr_text, textbuf, textlen );
        if ( rs->sr_err != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: entry failed schema check: %s (%d)\n",
-                       rs->sr_text, rs->sr_err, 0 );
+                       LDAP_XSTRING(bdb_add) ": entry failed schema check: "
+                       "%s (%d)\n", rs->sr_text, rs->sr_err, 0 );
                goto return_results;
        }
 
@@ -78,7 +78,8 @@ bdb_add(Operation *op, SlapReply *rs )
        rs->sr_err = bdb_next_id( op->o_bd, NULL, &op->oq_add.rs_e->e_id );
        if( rs->sr_err != 0 ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: next_id failed (%d)\n", rs->sr_err, 0, 0 );
+                       LDAP_XSTRING(bdb_add) ": next_id failed (%d)\n",
+                       rs->sr_err, 0, 0 );
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "internal error";
                goto return_results;
@@ -110,7 +111,7 @@ retry:      /* transaction retry */
        rs->sr_text = NULL;
        if( rs->sr_err != 0 ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: txn_begin failed: %s (%d)\n",
+                       LDAP_XSTRING(bdb_add) ": txn_begin failed: %s (%d)\n",
                        db_strerror(rs->sr_err), rs->sr_err, 0 );
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "internal error";
@@ -166,8 +167,9 @@ retry:      /* transaction retry */
                                : NULL;
                        bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
                        p = NULL;
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n",
-                               0, 0, 0 );
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent "
+                               "does not exist\n", 0, 0, 0 );
 
                        rs->sr_err = LDAP_REFERRAL;
                        send_ldap_result( op, rs );
@@ -191,7 +193,8 @@ retry:      /* transaction retry */
                        }
 
                        Debug( LDAP_DEBUG_TRACE,
-                               "bdb_add: no write access to parent\n", 0, 0, 0 );
+                               LDAP_XSTRING(bdb_add) ": no write access "
+                               "to parent\n", 0, 0, 0 );
                        rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                        rs->sr_text = "no write access to parent";
                        goto return_results;;
@@ -200,7 +203,8 @@ retry:      /* transaction retry */
 #ifdef BDB_SUBENTRIES
                if ( is_entry_subentry( p ) ) {
                        /* parent is a subentry, don't allow add */
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent is subentry\n",
                                0, 0, 0 );
                        rs->sr_err = LDAP_OBJECT_CLASS_VIOLATION;
                        rs->sr_text = "parent is a subentry";
@@ -209,7 +213,8 @@ retry:      /* transaction retry */
 #endif
                if ( is_entry_alias( p ) ) {
                        /* parent is an alias, don't allow add */
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent is alias\n",
                                0, 0, 0 );
                        rs->sr_err = LDAP_ALIAS_PROBLEM;
                        rs->sr_text = "parent is an alias";
@@ -221,7 +226,8 @@ retry:      /* transaction retry */
                        rs->sr_matched = p->e_name.bv_val;
                        rs->sr_ref = get_entry_referrals( op, p );
 
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is referral\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent is referral\n",
                                0, 0, 0 );
 
                        rs->sr_err = LDAP_REFERRAL;
@@ -254,7 +260,8 @@ retry:      /* transaction retry */
                if ((( !be_isroot( op ) && !be_shadow_update(op) )
                        || pdn.bv_len > 0 ) && !is_entry_glue( op->oq_add.rs_e ))
                {
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": %s denied\n",
                                pdn.bv_len == 0 ? "suffix" : "entry at root",
                                0, 0 );
                        rs->sr_err = LDAP_NO_SUCH_OBJECT;
@@ -280,7 +287,8 @@ retry:      /* transaction retry */
                        goto retry;
                }
 
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to entry\n",
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": no write access to entry\n",
                        0, 0, 0 );
                rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                rs->sr_text = "no write access to entry";
@@ -293,8 +301,8 @@ retry:      /* transaction retry */
        rs->sr_text = NULL;
        if( rs->sr_err != 0 ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: txn_begin(2) failed: %s (%d)\n",
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
+                       LDAP_XSTRING(bdb_add) ": txn_begin(2) failed: "
+                       "%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "internal error";
                goto return_results;
@@ -303,7 +311,8 @@ retry:      /* transaction retry */
        /* dn2id index */
        rs->sr_err = bdb_dn2id_add( op, lt2, ei, op->oq_add.rs_e );
        if ( rs->sr_err != 0 ) {
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": dn2id_add failed: %s (%d)\n",
                        db_strerror(rs->sr_err), rs->sr_err, 0 );
 
                switch( rs->sr_err ) {
@@ -322,7 +331,8 @@ retry:      /* transaction retry */
        /* id2entry index */
        rs->sr_err = bdb_id2entry_add( op->o_bd, lt2, op->oq_add.rs_e );
        if ( rs->sr_err != 0 ) {
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: id2entry_add failed\n",
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": id2entry_add failed\n",
                        0, 0, 0 );
                switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
@@ -338,7 +348,8 @@ retry:      /* transaction retry */
        /* attribute indexes */
        rs->sr_err = bdb_index_entry_add( op, lt2, op->oq_add.rs_e );
        if ( rs->sr_err != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n",
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": index_entry_add failed\n",
                        0, 0, 0 );
                switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
@@ -356,17 +367,6 @@ retry:     /* transaction retry */
                goto return_results;
        }
 
-       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;
-               case BDB_CSN_RETRY :
-                       goto retry;
-               }
-       }
-
        /* post-read */
        if( op->o_postread ) {
                if( postread_ctrl == NULL ) {
@@ -377,7 +377,8 @@ retry:      /* transaction retry */
                        &slap_post_read_bv, postread_ctrl ) )
                {
                        Debug( LDAP_DEBUG_TRACE,
-                               "<=- bdb_add: post-read failed!\n", 0, 0, 0 );
+                               "<=- " LDAP_XSTRING(bdb_add) ": post-read "
+                               "failed!\n", 0, 0, 0 );
                        goto return_results;
                }
        }
@@ -407,27 +408,6 @@ retry:     /* transaction retry */
                        suffix_ei = BEI(e);
                }
 
-               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 ( 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 ) {
-                                       Debug( LDAP_DEBUG_TRACE,
-                                               "bdb_add: persistent search failed (%d,%d)\n",
-                                               rc, rs->sr_err, 0 );
-                               }
-                       }
-                       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 {
@@ -439,13 +419,15 @@ retry:    /* transaction retry */
        op->o_private = NULL;
 
        if ( rs->sr_err != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n",
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": %s : %s (%d)\n",
                        rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
                rs->sr_err = LDAP_OTHER;
                goto return_results;
        }
 
-       Debug(LDAP_DEBUG_TRACE, "bdb_add: added%s id=%08lx dn=\"%s\"\n",
+       Debug(LDAP_DEBUG_TRACE,
+               LDAP_XSTRING(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 );