error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index c09502b16bacf64a6247c6f1a70d47157a401c5e..e663c8645c61325f8fb2b43c5c27e33d587022df 100644 (file)
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -1,7 +1,7 @@
 /* add.c - ldap ldbm back-end add routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -25,7 +25,7 @@ ldbm_back_add(
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       char            *pdn;
+       struct berval   pdn;
        Entry           *p = NULL;
        int                     rootlock = 0;
        int                     rc;
@@ -45,7 +45,7 @@ ldbm_back_add(
        /* nobody else can add until we lock our parent */
        ldap_pvt_thread_mutex_lock(&li->li_add_mutex);
 
-       if ( ( rc = dn2id( be, e->e_ndn, &id ) ) || id != NOID ) {
+       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, 
@@ -54,7 +54,7 @@ ldbm_back_add(
                return( -1 );
        }
 
-       rc = entry_schema_check( e, NULL, &text, textbuf, textlen );
+       rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
 
        if ( rc != LDAP_SUCCESS ) {
                ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
@@ -80,31 +80,32 @@ ldbm_back_add(
         * add the entry.
         */
 
-       pdn = dn_parent( be, e->e_ndn );
+       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( pdn != NULL && *pdn != '\0' ) {
+       if( pdn.bv_len ) {
                Entry *matched = NULL;
 
-               assert( *pdn != '\0' );
-
                /* get parent with writer lock */
-               if ( (p = dn2entry_w( be, pdn, &matched )) == NULL ) {
+               if ( (p = dn2entry_w( be, &pdn, &matched )) == NULL ) {
                        char *matched_dn = NULL;
-                       struct berval **refs;
+                       BVarray refs;
 
                        ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 
                        if ( matched != NULL ) {
                                matched_dn = ch_strdup( matched->e_dn );
                                refs = is_entry_referral( matched )
-                                       ? get_entry_referrals( be, conn, op, matched,
-                                               e->e_dn, LDAP_SCOPE_DEFAULT )
+                                       ? get_entry_referrals( be, conn, op, matched )
                                        : NULL;
                                cache_return_entry_r( &li->li_cache, matched );
 
                        } else {
                                refs = referral_rewrite( default_referral,
-                                       NULL, e->e_dn, LDAP_SCOPE_DEFAULT );
+                                       NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
                        }
 
 #ifdef NEW_LOGGING
@@ -120,18 +121,15 @@ ldbm_back_add(
                                refs == NULL ? "parent does not exist" : "parent is referral",
                                refs, NULL );
 
-                       ber_bvecfree( refs );
+                       bvarray_free( refs );
                        free( matched_dn );
 
-                       free( pdn );
                        return -1;
                }
 
                /* don't need the add lock anymore */
                ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 
-               free(pdn);
-
                if ( ! access_allowed( be, conn, op, p,
                        children, NULL, ACL_WRITE ) )
                {
@@ -178,9 +176,8 @@ ldbm_back_add(
                if ( is_entry_referral( p ) ) {
                        /* parent is a referral, don't allow add */
                        char *matched_dn = ch_strdup( p->e_dn );
-                       struct berval **refs = is_entry_referral( p )
-                               ? get_entry_referrals( be, conn, op, p,
-                                       e->e_dn, LDAP_SCOPE_DEFAULT )
+                       BVarray refs = is_entry_referral( p )
+                               ? get_entry_referrals( be, conn, op, p )
                                : NULL;
 
                        /* free parent and writer lock */
@@ -197,22 +194,20 @@ ldbm_back_add(
                        send_ldap_result( conn, op, LDAP_REFERRAL,
                            matched_dn, NULL, refs, NULL );
 
-                       ber_bvecfree( refs );
+                       bvarray_free( refs );
                        free( matched_dn );
                        return -1;
                }
 
        } else {
-               if(pdn != NULL) {
-                       assert( *pdn == '\0' );
-                       free(pdn);
+               if(pdn.bv_val != NULL) {
+                       assert( *pdn.bv_val == '\0' );
                }
 
                /* no parent, must be adding entry to root */
-               if ( !be_isroot( be, op->o_ndn ) ) {
-                       if ( be_issuffix( be, "" ) ) {
-                               static const Entry rootp = { NOID, "", "", NULL, NULL };
-                               p = (Entry *)&rootp;
+               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 );
@@ -246,11 +241,11 @@ ldbm_back_add(
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
                                           "ldbm_back_add: %s add denied.\n",
-                                          pdn == NULL ? "suffix" 
+                                          pdn.bv_val == NULL ? "suffix" 
                                           : "entry at root" ));
 #else
                                Debug( LDAP_DEBUG_TRACE, "%s add denied\n",
-                                               pdn == NULL ? "suffix" 
+                                               pdn.bv_val == NULL ? "suffix" 
                                                : "entry at root", 0, 0 );
 #endif
 
@@ -347,7 +342,7 @@ ldbm_back_add(
        }
 
        /* dn2id index */
-       if ( dn2id_add( be, e->e_ndn, e->e_id ) != 0 ) {
+       if ( dn2id_add( be, &e->e_nname, e->e_id ) != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
                           "ldbm_back_add: dn2id_add failed.\n" ));
@@ -374,7 +369,7 @@ ldbm_back_add(
 #endif
 
                /* FIXME: delete attr indices? */
-               (void) dn2id_delete( be, e->e_ndn, e->e_id );
+               (void) dn2id_delete( be, &e->e_nname, e->e_id );
                
                send_ldap_result( conn, op, LDAP_OTHER,
                        NULL, "entry store failed", NULL, NULL );