/* add.c - ldap ldbm back-end add routine */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 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-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"
int
ldbm_back_add(
- Backend *be,
- Connection *conn,
Operation *op,
- Entry *e
-)
+ SlapReply *rs )
{
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+ struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
struct berval pdn;
Entry *p = NULL;
- int rootlock = 0;
- int rc;
ID id = NOID;
- const char *text = NULL;
AttributeDescription *children = slap_schema.si_ad_children;
+ AttributeDescription *entry = slap_schema.si_ad_entry;
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf;
+#ifdef LDBM_SUBENTRIES
+ int subentry;
+#endif
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,"ldbm_back_add: %s\n",
- e->e_dn ));
+ 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", e->e_dn, 0, 0);
+ Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n",
+ op->o_req_dn.bv_val, 0, 0);
#endif
+
+ rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, NULL,
+ &rs->sr_text, textbuf, textlen );
- /* nobody else can add until we lock our parent */
- ldap_pvt_thread_mutex_lock(&li->li_add_mutex);
+ 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
- if ( ( rc = dn2id( be, &e->e_nname, &id ) ) || id != NOID ) {
- /* if (rc) something bad happened to ldbm cache */
- ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
- send_ldap_result( conn, op,
- rc ? LDAP_OPERATIONS_ERROR : LDAP_ALREADY_EXISTS,
- NULL, NULL, NULL, NULL );
- return( -1 );
+ send_ldap_result( op, rs );
+ return rs->sr_err;
}
- rc = entry_schema_check( e, NULL, &text, textbuf, textlen );
-
- if ( rc != LDAP_SUCCESS ) {
- ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
+#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 ) )
+ {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: entry (%s) failed schema check.\n",
- e->e_dn ));
+ 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, "entry failed schema check: %s\n",
- text, 0, 0 );
+ 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" );
+
+ return LDAP_INSUFFICIENT_ACCESS;
+ }
+
+ /* grab giant lock for writing */
+ ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
- send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
- return( -1 );
+ 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;
+ send_ldap_result( op, rs );
+ return rs->sr_err;
}
/*
* add the entry.
*/
- pdn.bv_val = dn_parent( be, e->e_ndn );
- if (pdn.bv_val && pdn.bv_val[0])
- pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn);
- else
- pdn.bv_len = 0;
+ if ( be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+ pdn = slap_empty_bv;
+ } else {
+ dnParent( &op->o_req_ndn, &pdn );
+ }
if( pdn.bv_len ) {
Entry *matched = NULL;
/* get parent with writer lock */
- if ( (p = dn2entry_w( be, &pdn, &matched )) == NULL ) {
- char *matched_dn = NULL;
- BVarray refs;
-
- ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
-
+ if ( (p = dn2entry_w( op->o_bd, &pdn, &matched )) == NULL ) {
if ( matched != NULL ) {
- matched_dn = ch_strdup( matched->e_dn );
- refs = is_entry_referral( matched )
- ? get_entry_referrals( be, conn, op, matched )
+ rs->sr_matched = ch_strdup( matched->e_dn );
+ rs->sr_ref = is_entry_referral( matched )
+ ? get_entry_referrals( op, matched )
: NULL;
cache_return_entry_r( &li->li_cache, matched );
} else {
- refs = referral_rewrite( default_referral,
- NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+ rs->sr_ref = referral_rewrite( default_referral,
+ NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
}
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
+
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: Parent of (%s) does not exist.\n",
- e->e_dn ));
+ 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
- send_ldap_result( conn, op, LDAP_REFERRAL, matched_dn,
- refs == NULL ? "parent does not exist" : "parent is referral",
- refs, NULL );
-
- bvarray_free( refs );
- free( matched_dn );
+ rs->sr_text = rs->sr_ref
+ ? "parent is referral" : "parent does not exist";
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
- return -1;
+ ber_bvarray_free( rs->sr_ref );
+ free( (char *)rs->sr_matched );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
+ return rs->sr_err;
}
- /* don't need the add lock anymore */
- ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
-
- if ( ! access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE ) )
- {
+ if ( ! access_allowed( op, p, children, NULL, ACL_WRITE, 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(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: No write access to parent (%s).\n",
- e->e_dn ));
+ 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_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
- NULL, "no write access to parent", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+ "no write access to parent" );
+ return LDAP_INSUFFICIENT_ACCESS;
+ }
- return -1;
+#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 */
/* 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(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: Parent is an alias.\n"));
+ 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" );
- send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM,
- NULL, "parent is an alias", NULL, NULL );
-
- return -1;
+ return LDAP_ALIAS_PROBLEM;
}
if ( is_entry_referral( p ) ) {
/* parent is a referral, don't allow add */
- char *matched_dn = ch_strdup( p->e_dn );
- BVarray refs = is_entry_referral( p )
- ? get_entry_referrals( be, conn, op, p )
+ rs->sr_matched = ch_strdup( p->e_dn );
+ rs->sr_ref = is_entry_referral( p )
+ ? get_entry_referrals( op, p )
: 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(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: Parent is referral.\n" ));
+ 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
-
- send_ldap_result( conn, op, LDAP_REFERRAL,
- matched_dn, NULL, refs, NULL );
-
- bvarray_free( refs );
- free( matched_dn );
- return -1;
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
+
+ ber_bvarray_free( rs->sr_ref );
+ free( (char *)rs->sr_matched );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
+ return rs->sr_err;
}
- } else {
- if(pdn.bv_val != NULL) {
- assert( *pdn.bv_val == '\0' );
+#ifdef LDBM_SUBENTRIES
+ if ( subentry ) {
+ /* FIXME: */
+ /* parent must be an administrative point of the required kind */
}
-
- /* no parent, must be adding entry to root */
- if ( !be_isroot( be, &op->o_ndn ) ) {
- if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
- p = (Entry *)&slap_entry_root;
-
- rc = access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE );
- p = NULL;
-
- if ( ! rc ) {
- ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
-
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: No write "
- "access to parent (\"\").\n" ));
-#else
- Debug( LDAP_DEBUG_TRACE,
- "no write access to parent\n",
- 0, 0, 0 );
#endif
- send_ldap_result( conn, op,
- LDAP_INSUFFICIENT_ACCESS,
- NULL,
- "no write access to parent",
- NULL, NULL );
-
- return -1;
- }
+ } else {
+ assert( pdn.bv_val == NULL || *pdn.bv_val == '\0' );
- } else {
- ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
+ if ( !be_isroot( op->o_bd, &op->o_ndn )
+ && !is_entry_glue( op->oq_add.rs_e ))
+ {
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: %s add denied.\n",
- pdn.bv_val == NULL ? "suffix"
- : "entry at root" ));
+ 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 );
+ Debug( LDAP_DEBUG_TRACE, "%s add denied\n",
+ pdn.bv_val == NULL ? "suffix" : "entry at root", 0, 0 );
#endif
- send_ldap_result( conn, op,
- LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
-
- return -1;
- }
+ send_ldap_error( op, rs, LDAP_NO_SUCH_OBJECT, NULL );
+ return LDAP_NO_SUCH_OBJECT;
}
-
- /*
- * no parent, acquire the root write lock
- * and release the add lock.
- */
- ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
- rootlock = 1;
- ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
}
- if ( next_id( be, &e->e_id ) ) {
+ if ( next_id( op->o_bd, &op->oq_add.rs_e->e_id ) ) {
if( p != NULL) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
}
- if ( rootlock ) {
- /* release root lock */
- ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
- }
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: next_id failed.\n" ));
+ 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" );
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "next_id add failed", NULL, NULL );
-
- return( -1 );
+ return LDAP_OTHER;
}
/*
* Try to add the entry to the cache, assign it a new dnid.
*/
- rc = cache_add_entry_rw(&li->li_cache, e, CACHE_WRITE_LOCK);
+ rs->sr_err = cache_add_entry_rw( &li->li_cache, op->oq_add.rs_e,
+ CACHE_WRITE_LOCK );
- if ( rc != 0 ) {
+ if ( rs->sr_err != 0 ) {
if( p != NULL) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
}
- if ( rootlock ) {
- /* release root lock */
- ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
- }
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: cache_add_entry_lock failed.\n" ));
+ 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
- send_ldap_result( conn, op,
- rc > 0 ? LDAP_ALREADY_EXISTS : LDAP_OTHER,
- NULL, rc > 0 ? NULL : "cache add failed", NULL, NULL );
+ rs->sr_text = rs->sr_err > 0 ? NULL : "cache add failed";
+ rs->sr_err = rs->sr_err > 0 ? LDAP_ALREADY_EXISTS : LDAP_OTHER;
+ send_ldap_result( op, rs );
- return( -1 );
+ return rs->sr_err;
}
- rc = -1;
+ rs->sr_err = -1;
/* attribute indexes */
- if ( index_entry_add( be, e, e->e_attrs ) != LDAP_SUCCESS ) {
+ if ( index_entry_add( op, op->oq_add.rs_e ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: index_entry_add failed.\n" ));
+ 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_result( conn, op, LDAP_OTHER,
- NULL, "index generation failed", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "index generation failed" );
goto return_results;
}
/* dn2id index */
- if ( dn2id_add( be, &e->e_nname, e->e_id ) != 0 ) {
+ 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(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: dn2id_add failed.\n" ));
+ LDAP_LOG( BACK_LDBM, ERR,
+ "ldbm_back_add: dn2id_add failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "dn2id_add failed\n", 0,
0, 0 );
#endif
/* FIXME: delete attr indices? */
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "DN index generation failed", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "DN index generation failed" );
goto return_results;
}
/* id2entry index */
- if ( id2entry_add( be, e ) != 0 ) {
+ if ( id2entry_add( op->o_bd, op->oq_add.rs_e ) != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: id2entry_add failed.\n" ));
+ 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( be, &e->e_nname, 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_result( conn, op, LDAP_OTHER,
- NULL, "entry store failed", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "entry store failed" );
goto return_results;
}
- send_ldap_result( conn, op, LDAP_SUCCESS,
- NULL, NULL, NULL, NULL );
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_text = NULL;
+ send_ldap_result( op, rs );
/* marks the entry as committed, so it is added to the cache;
* otherwise it is removed from the cache, but not destroyed;
* it will be destroyed by the caller */
- rc = 0;
- cache_entry_commit( e );
+ cache_entry_commit( op->oq_add.rs_e );
return_results:;
if (p != NULL) {
cache_return_entry_w( &li->li_cache, p );
}
- if ( rootlock ) {
- /* release root lock */
- ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
- }
-
- if ( rc ) {
- /* in case of error, writer lock is freed
- * and entry's private data is destroyed */
- cache_return_entry_w( &li->li_cache, e );
+ if ( rs->sr_err ) {
+ /*
+ * in case of error, writer lock is freed
+ * and entry's private data is destroyed.
+ * otherwise, this is done when entry is released
+ */
+ cache_return_entry_w( &li->li_cache, op->oq_add.rs_e );
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
}
- return( rc );
+ return( rs->sr_err );
}
projects / openldap / blobdiff