]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/add.c
projects / openldap / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix ITS#3255, boi_bdb comparisons
[openldap] / servers / slapd / back-bdb / add.c
diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index 892e969f9c42623bd9d606940454dd8205f9d01a..6174a516167868d07a9399669df41b0ebf1dd65c 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-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,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;
@@ -49,21 +49,28 @@ bdb_add(Operation *op, SlapReply *rs )
        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",
@@ -121,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",
@@ -182,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 );
@@ -214,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";
@@ -293,8 +301,8 @@ retry:      /* transaction retry */
                 * no parent!
                 *  if not attempting to add entry at suffix or with parent ""
                 */
-               if (( !be_isroot( op->o_bd, &op->o_ndn ) || pdn.bv_len > 0 )
-                       && !is_entry_glue( op->oq_add.rs_e ))
+               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: %s denied\n", 
@@ -339,23 +347,6 @@ retry:     /* transaction retry */
                goto return_results;;
        }
 
-       /* post-read */
-       if( op->o_postread ) {
-               if ( slap_read_controls( op, rs, op->oq_add.rs_e,
-                       &slap_post_read_bv, &ctrls[num_ctrls] ) )
-               {
-#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;
-               }
-               ctrls[++num_ctrls] = NULL;
-       }
-
        /* nested transaction */
        rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
                bdb->bi_db_opflags );
@@ -457,6 +448,26 @@ retry:     /* transaction retry */
                }
        }
 
+       /* post-read */
+       if( op->o_postread ) {
+               if( postread_ctrl == NULL ) {
+                       postread_ctrl = &ctrls[num_ctrls++];
+                       ctrls[num_ctrls] = NULL;
+               }
+               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;
+               }
+       }
+
        if ( op->o_noop ) {
                if (( rs->sr_err=TXN_ABORT( ltid )) != 0 ) {
                        rs->sr_text = "txn_abort (no-op) failed";
@@ -490,12 +501,23 @@ retry:    /* transaction retry */
                }
 
                if ( rs->sr_err == LDAP_SUCCESS && !op->o_no_psearch ) {
-                       ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
+                       ldap_pvt_thread_rdwr_wlock( &bdb->bi_pslist_rwlock );
+                       assert( BEI(e) );
                        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 );
+                               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_runlock( &bdb->bi_pslist_rwlock );
+                       ldap_pvt_thread_rdwr_wunlock( &bdb->bi_pslist_rwlock );
                }
 
                if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
@@ -510,9 +532,8 @@ retry:      /* transaction retry */
 
        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 );
@@ -550,5 +571,9 @@ done:
                op->o_private = NULL;
        }
 
+       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;
 }
Cloned from git://git.openldap.org/openldap.git