/* add.c - ldap ldbm 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 1998-2006 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"
#include "back-ldbm.h"
#include "proto-back-ldbm.h"
+static int
+ldbm_csn_cb(
+ Operation *op,
+ SlapReply *rs )
+{
+ op->o_callback = op->o_callback->sc_next;
+ slap_graduate_commit_csn( op );
+ return SLAP_CB_CONTINUE;
+}
+
int
ldbm_back_add(
Operation *op,
AttributeDescription *entry = slap_schema.si_ad_entry;
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf;
-#ifdef LDBM_SUBENTRIES
+ slap_callback cb = { NULL };
int subentry;
-#endif
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_add: %s\n", op->o_req_dn.bv_val, 0, 0 );
-#else
- Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", op->o_req_dn.bv_val, 0, 0);
-#endif
+ Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n",
+ op->o_req_dn.bv_val, 0, 0);
- rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, NULL, &rs->sr_text, textbuf, textlen );
+ slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
+
+ cb.sc_cleanup = ldbm_csn_cb;
+ cb.sc_next = op->o_callback;
+ op->o_callback = &cb;
+
+ rs->sr_err = entry_schema_check( op, op->oq_add.rs_e, NULL,
+ get_manageDIT(op), &rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: entry (%s) failed schema check.\n", op->o_req_dn.bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "entry failed schema check: %s\n",
rs->sr_text, 0, 0 );
-#endif
send_ldap_result( op, rs );
return rs->sr_err;
}
+ rs->sr_text = NULL;
-#ifdef LDBM_SUBENTRIES
subentry = is_entry_subentry( op->oq_add.rs_e );
-#endif
if ( !access_allowed( op, op->oq_add.rs_e,
- entry, NULL, ACL_WRITE, NULL ) )
+ entry, NULL, ACL_WADD, NULL ) )
{
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: No write access to entry (%s).\n",
- op->o_req_dn.bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "no write access to entry\n", 0,
0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
"no write access to entry" );
/* grab giant lock for writing */
ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
- if ( ( rs->sr_err = dn2id( op->o_bd, &op->o_req_ndn, &id ) ) || id != NOID ) {
+ rs->sr_err = dn2id( op->o_bd, &op->o_req_ndn, &id );
+ if ( rs->sr_err || id != NOID ) {
/* if (rs->sr_err) something bad happened to ldbm cache */
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
rs->sr_err = rs->sr_err ? LDAP_OTHER : LDAP_ALREADY_EXISTS;
dnParent( &op->o_req_ndn, &pdn );
}
- if( pdn.bv_len )
- {
+ if( pdn.bv_len ) {
Entry *matched = NULL;
/* get parent with writer lock */
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: Parent of (%s) does not exist.\n",
- op->o_req_dn.bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
0, 0, 0 );
-#endif
- rs->sr_text = rs->sr_ref ? "parent is referral" : "parent does not exist";
+ rs->sr_text = rs->sr_ref
+ ? "parent is referral" : "parent does not exist";
rs->sr_err = LDAP_REFERRAL;
send_ldap_result( op, rs );
return rs->sr_err;
}
- if ( ! access_allowed( op, p,
- children, NULL, ACL_WRITE, NULL ) )
- {
+ if ( ! access_allowed( op, p, children, NULL, ACL_WADD, NULL ) ) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: No write access to parent (%s).\n",
- op->o_req_dn.bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "no write access to parent\n", 0,
0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
"no write access to parent" );
return LDAP_INSUFFICIENT_ACCESS;
}
-#ifdef LDBM_SUBENTRIES
if ( is_entry_subentry( p )) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "bdb_add: parent is subentry\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
0, 0, 0 );
-#endif
rs->sr_err = LDAP_OBJECT_CLASS_VIOLATION;
rs->sr_text = "parent is a subentry";
goto return_results;
}
-#endif
if ( is_entry_alias( p ) ) {
/* parent is an alias, don't allow add */
cache_return_entry_w( &li->li_cache, p );
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-#ifdef NEW_LOGGING
- LDAP_LOG(BACK_LDBM, ERR,
- "ldbm_back_add: Parent is an alias.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "parent is alias\n", 0,
0, 0 );
-#endif
-
send_ldap_error( op, rs, LDAP_ALIAS_PROBLEM,
"parent is an alias" );
cache_return_entry_w( &li->li_cache, p );
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: Parent is referral.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "parent is referral\n", 0,
0, 0 );
-#endif
rs->sr_err = LDAP_REFERRAL;
send_ldap_result( op, rs );
return rs->sr_err;
}
-#ifdef LDBM_SUBENTRIES
if ( subentry ) {
/* FIXME: */
/* parent must be an administrative point of the required kind */
}
-#endif
} else {
- if( pdn.bv_val != NULL )
- {
- assert( *pdn.bv_val == '\0' );
- }
+ assert( pdn.bv_val == NULL || *pdn.bv_val == '\0' );
- /* no parent, must be adding entry to root */
- if ( !be_isroot( op->o_bd, &op->o_ndn ) )
+ if (( !be_isroot(op) && !be_shadow_update(op) )
+ && !is_entry_glue( op->oq_add.rs_e ))
{
- if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv ) || be_isupdate( op->o_bd, &op->o_ndn ) ) {
- p = (Entry *)&slap_entry_root;
-
- rs->sr_err = access_allowed( op, p,
- children, NULL, ACL_WRITE, NULL );
- p = NULL;
-
- if ( ! rs->sr_err ) {
- ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: No write "
- "access to parent (\"\").\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "no write access to parent\n",
- 0, 0, 0 );
-#endif
-
- send_ldap_error( op, rs,
- LDAP_INSUFFICIENT_ACCESS,
- "no write access to parent" );
-
- return LDAP_INSUFFICIENT_ACCESS;
- }
- } else if ( !is_entry_glue( op->oq_add.rs_e )) {
- ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: %s add denied.\n",
- pdn.bv_val == NULL ? "suffix"
- : "entry at root", 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "%s add denied\n",
- pdn.bv_val == NULL ? "suffix"
- : "entry at root", 0, 0 );
-#endif
-
- send_ldap_error( op, rs,
- LDAP_NO_SUCH_OBJECT, NULL );
-
- return LDAP_NO_SUCH_OBJECT;
- }
- }
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-#ifdef LDBM_SUBENTRIES
- if( subentry ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, DETAIL1,
- "bdb_add: no parent, cannot add subentry\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_add: no parent, cannot add subentry\n", 0, 0, 0 );
-#endif
- rs->sr_err = LDAP_NO_SUCH_OBJECT;
- rs->sr_text = "no parent, cannot add subentry";
- goto return_results;
- }
-#endif
+ Debug( LDAP_DEBUG_TRACE, "%s add denied\n",
+ pdn.bv_val == NULL ? "suffix" : "entry at root", 0, 0 );
+ send_ldap_error( op, rs, LDAP_NO_SUCH_OBJECT, NULL );
+ return LDAP_NO_SUCH_OBJECT;
+ }
}
if ( next_id( op->o_bd, &op->oq_add.rs_e->e_id ) ) {
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: next_id failed.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "ldbm_add: next_id failed\n",
0, 0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_OTHER,
"next_id add failed" );
/*
* Try to add the entry to the cache, assign it a new dnid.
*/
- rs->sr_err = cache_add_entry_rw(&li->li_cache, op->oq_add.rs_e, CACHE_WRITE_LOCK);
+ rs->sr_err = cache_add_entry_rw( &li->li_cache, op->oq_add.rs_e,
+ CACHE_WRITE_LOCK );
if ( rs->sr_err != 0 ) {
if( p != NULL) {
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: cache_add_entry_lock failed.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "cache_add_entry_lock failed\n", 0, 0,
0 );
-#endif
rs->sr_text = rs->sr_err > 0 ? NULL : "cache add failed";
rs->sr_err = rs->sr_err > 0 ? LDAP_ALREADY_EXISTS : LDAP_OTHER;
/* attribute indexes */
if ( index_entry_add( op, op->oq_add.rs_e ) != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: index_entry_add failed.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "index_entry_add failed\n", 0,
0, 0 );
-#endif
send_ldap_error( op, rs, LDAP_OTHER,
"index generation failed" );
}
/* dn2id index */
- if ( dn2id_add( op->o_bd, &op->oq_add.rs_e->e_nname, op->oq_add.rs_e->e_id ) != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: dn2id_add failed.\n", 0, 0, 0 );
-#else
+ if ( dn2id_add( op->o_bd, &op->oq_add.rs_e->e_nname,
+ op->oq_add.rs_e->e_id ) != 0 )
+ {
Debug( LDAP_DEBUG_TRACE, "dn2id_add failed\n", 0,
0, 0 );
-#endif
/* FIXME: delete attr indices? */
send_ldap_error( op, rs, LDAP_OTHER,
/* id2entry index */
if ( id2entry_add( op->o_bd, op->oq_add.rs_e ) != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "ldbm_back_add: id2entry_add failed.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "id2entry_add failed\n", 0,
0, 0 );
-#endif
/* FIXME: delete attr indices? */
- (void) dn2id_delete( op->o_bd, &op->oq_add.rs_e->e_nname, op->oq_add.rs_e->e_id );
+ (void) dn2id_delete( op->o_bd, &op->oq_add.rs_e->e_nname,
+ op->oq_add.rs_e->e_id );
send_ldap_error( op, rs, LDAP_OTHER,
"entry store failed" );
projects / openldap / blobdiff