Factor out ldif2* intialization to ldif2common.c

[openldap] / servers / slapd / back-bdb2 / delete.c

diff --git a/servers/slapd/back-bdb2/delete.c b/servers/slapd/back-bdb2/delete.c
index a47c32e88ad6d9ceb9e9a8b4f53cedcffe7aae55..ca36c2bacff0501616aa555c0be664263ef8c533 100644 (file)
--- a/servers/slapd/back-bdb2/delete.c
+++ b/servers/slapd/back-bdb2/delete.c
@@ -20,32 +20,63 @@ bdb2i_back_delete_internal(
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       char    *matched = NULL;
+       Entry   *matched = NULL;
        char    *pdn = NULL;
        Entry   *e, *p = NULL;
-       int rootlock = 0;
-       int     rc = -1;
+       int     rc = -1, manageDSAit;
 
        Debug(LDAP_DEBUG_ARGS, "==> bdb2i_back_delete: %s\n", dn, 0, 0);
 
        /* get entry with writer lock */
        if ( (e = bdb2i_dn2entry_w( be, dn, &matched )) == NULL ) {
+               char *matched_dn = NULL;
+               struct berval **refs = NULL;
+
                Debug(LDAP_DEBUG_ARGS, "<=- bdb2i_back_delete: no such object %s\n",
                        dn, 0, 0);
-               send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, matched, "" );
+
                if ( matched != NULL ) {
-                       free( matched );
+                       matched_dn = ch_strdup( matched->e_dn );
+                       refs = is_entry_referral( matched )
+                               ? get_entry_referrals( be, conn, op, matched )
+                               : NULL;
+                       bdb2i_cache_return_entry_r( &li->li_cache, matched );
+               } else {
+                       refs = default_referral;
+               }
+
+               send_ldap_result( conn, op, LDAP_REFERRAL,
+                       matched_dn, NULL, refs, NULL );
+
+               if( matched != NULL ) {
+                       ber_bvecfree( refs );
+                       free( matched_dn );
                }
+
                return( -1 );
        }
 
-       /* check for deleted */
+       if (!manageDSAit && is_entry_referral( e ) ) {
+               /* entry is a referral, don't allow add */
+               struct berval **refs = get_entry_referrals( be,
+                       conn, op, e );
+
+               Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
+                       0, 0 );
+
+               send_ldap_result( conn, op, LDAP_REFERRAL,
+                       e->e_dn, NULL, refs, NULL );
+
+               ber_bvecfree( refs );
+               goto return_results;
+       }
+
 
        if ( bdb2i_has_children( be, e ) ) {
                Debug(LDAP_DEBUG_ARGS, "<=- bdb2i_back_delete: non leaf %s\n",
                        dn, 0, 0);
-               send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF, "",
-                   "" );
+               send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF,
+                       NULL, NULL, NULL, NULL );
                goto return_results;
        }
 
@@ -56,22 +87,22 @@ bdb2i_back_delete_internal(
                Debug(LDAP_DEBUG_ARGS,
                        "<=- bdb2i_back_delete: insufficient access %s\n",
                        dn, 0, 0);
-               send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, "", "" );
+               send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
+                       NULL, NULL, NULL, NULL );
                goto return_results;
        }
 #endif
 
        /* delete from parent's id2children entry */
-       if( (pdn = dn_parent( be, dn )) != NULL ) {
+       if( (pdn = dn_parent( be, e->e_ndn )) != NULL ) {
                if( (p = bdb2i_dn2entry_w( be, pdn, &matched )) == NULL) {
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- bdb2i_back_delete: parent does not exist\n", 0, 0, 0);
                        send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                               "", "");
+                               NULL, NULL, NULL, NULL );
                        goto return_results;
                }
 
-#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
                /* check parent for "children" acl */
                if ( ! access_allowed( be, conn, op, p,
                        "children", NULL, ACL_WRITE ) )
@@ -79,10 +110,9 @@ bdb2i_back_delete_internal(
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- bdb2i_back_delete: no access to parent\n", 0, 0, 0 );
                        send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                               "", "" );
+                               NULL, NULL, NULL, NULL );
                        goto return_results;
                }
-#endif
 
        } else {
                /* no parent, must be root to delete */
@@ -90,28 +120,27 @@ bdb2i_back_delete_internal(
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- bdb2i_back_delete: no parent & not root\n", 0, 0, 0);
                        send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                               "", "");
+                               NULL, NULL, NULL, NULL );
                        goto return_results;
                }
-
-               /* DDD ldap_pvt_thread_mutex_lock(&li->li_root_mutex); */
-               rootlock = 1;
        }
 
        if ( bdb2i_id2children_remove( be, p, e ) != 0 ) {
                Debug(LDAP_DEBUG_ARGS,
                        "<=- bdb2i_back_delete: operations error %s\n",
                        dn, 0, 0);
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "","" );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                               NULL, NULL, NULL, NULL );
                goto return_results;
        }
 
        /* delete from dn2id mapping */
-       if ( bdb2i_dn2id_delete( be, e->e_dn ) != 0 ) {
+       if ( bdb2i_dn2id_delete( be, e->e_ndn ) != 0 ) {
                Debug(LDAP_DEBUG_ARGS,
                        "<=- bdb2i_back_delete: operations error %s\n",
                        dn, 0, 0);
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
                goto return_results;
        }
 
@@ -120,11 +149,13 @@ bdb2i_back_delete_internal(
                Debug(LDAP_DEBUG_ARGS,
                        "<=- bdb2i_back_delete: operations error %s\n",
                        dn, 0, 0);
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
                goto return_results;
        }
 
-       send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
+       send_ldap_result( conn, op, LDAP_SUCCESS,
+               NULL, NULL, NULL, NULL );
        rc = 0;
 
 return_results:;
@@ -136,11 +167,6 @@ return_results:;
 
        }
 
-       if ( rootlock ) {
-               /* release root lock */
-               /* DDD ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); */
-       }
-
        /* free entry and writer lock */
        bdb2i_cache_return_entry_w( &li->li_cache, e );
 
@@ -165,15 +191,14 @@ bdb2_back_delete(
 
        bdb2i_start_timing( be->bd_info, &time1 );
 
-       if ( bdb2i_enter_backend_w( get_dbenv( be ), &lock ) != 0 ) {
-
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
+       if ( bdb2i_enter_backend_w( &lock ) != 0 ) {
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
                return( -1 );
-
        }
 
        ret = bdb2i_back_delete_internal( be, conn, op, dn );
-       (void) bdb2i_leave_backend( get_dbenv( be ), lock );
+       (void) bdb2i_leave_backend_w( lock );
        bdb2i_stop_timing( be->bd_info, time1, "DEL", conn, op );
 
        return( ret );