Fix -USLAPD_RLOOKUPS

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

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 79f405a7b5422e0075fef66bf9f85cc9fee732ec..53bdd22f7ce89163521825ce43b44903e1bece9a 100644 (file)
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -20,37 +20,42 @@ ldbm_back_delete(
 )
 {
        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             manageDSAit = get_manageDSAit( op );
 
        Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn, 0, 0);
 
        /* get entry with writer lock */
        if ( (e = dn2entry_w( be, dn, &matched )) == NULL ) {
+               char *matched_dn = NULL;
+               struct berval **refs = NULL;
+
                Debug(LDAP_DEBUG_ARGS, "<=- ldbm_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;
+                       cache_return_entry_r( &li->li_cache, matched );
+               } else {
+                       refs = default_referral;
                }
-               return( -1 );
-       }
 
-       Debug (LDAP_DEBUG_TRACE,
-               "rdwr_Xchk: readers_reading: %d writer_writing: %d\n",
-               e->e_rdwr.readers_reading, e->e_rdwr.writer_writing, 0);
+               send_ldap_result( conn, op, LDAP_REFERRAL,
+                       matched_dn, NULL, refs, NULL );
 
-       /* check for deleted */
+               if ( matched != NULL ) {
+                       ber_bvecfree( refs );
+                       free( matched_dn );
+               }
 
-       if ( has_children( be, e ) ) {
-               Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
-                       dn, 0, 0);
-               send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF, "",
-                   "" );
-               goto return_results;
+               return( -1 );
        }
 
 #ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
@@ -60,49 +65,74 @@ ldbm_back_delete(
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_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
 
-       Debug (LDAP_DEBUG_TRACE,
-               "rdwr_Xchk: readers_reading: %d writer_writing: %d\n",
-               e->e_rdwr.readers_reading, e->e_rdwr.writer_writing, 0);
+    if ( !manageDSAit && is_entry_referral( e ) ) {
+               /* parent is a referral, don't allow add */
+               /* parent is an alias, 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 );
+
+               rc = 1;
+               goto return_results;
+       }
+
+
+       if ( has_children( be, e ) ) {
+               Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
+                       dn, 0, 0);
+               send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF,
+                       NULL, NULL, NULL, NULL );
+               goto return_results;
+       }
 
        /* delete from parent's id2children entry */
-       if( (pdn = dn_parent( be, dn )) != NULL ) {
+       if( (pdn = dn_parent( be, e->e_ndn )) != NULL ) {
                if( (p = dn2entry_w( be, pdn, &matched )) == NULL) {
-                       Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               "<=- ldbm_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 ) )
                {
-                       Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
+                       Debug( LDAP_DEBUG_TRACE,
+                               "<=- ldbm_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 */
                if( ! be_isroot( be, op->o_ndn ) ) {
-                       Debug( LDAP_DEBUG_TRACE, "no parent & not root\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               "<=- ldbm_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;
                }
 
-               pthread_mutex_lock(&li->li_root_mutex);
+               ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
                rootlock = 1;
        }
 
@@ -110,16 +140,18 @@ ldbm_back_delete(
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_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 ( dn2id_delete( be, e->e_dn ) != 0 ) {
+       if ( dn2id_delete( be, e->e_ndn ) != 0 ) {
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_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;
        }
 
@@ -128,11 +160,13 @@ ldbm_back_delete(
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_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:;
@@ -145,7 +179,7 @@ return_results:;
 
        if ( rootlock ) {
                /* release root lock */
-               pthread_mutex_unlock(&li->li_root_mutex);
+               ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
        }
 
        /* free entry and writer lock */