Import minor trace output cleanup

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

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 7e0008ba802e50b576011d07c2f0017e6a36878f..8511c140808e25a0c4230a3e254b69380c71d8c9 100644 (file)
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -20,9 +20,11 @@ ldbm_back_delete(
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       char            *matched = NULL;
-        char            *pdn = NULL;
-       Entry           *e, *p;
+       char    *matched = NULL;
+       char    *pdn = NULL;
+       Entry   *e, *p = NULL;
+       int rootlock = 0;
+       int     rc = -1;
 
        Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn, 0, 0);
 
@@ -48,29 +50,67 @@ ldbm_back_delete(
                        dn, 0, 0);
                send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF, "",
                    "" );
-               goto error_return;
+               goto return_results;
        }
 
+#ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
        if ( ! access_allowed( be, conn, op, e, "entry", NULL, op->o_dn,
            ACL_WRITE ) ) {
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_back_delete: insufficient access %s\n",
                        dn, 0, 0);
                send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, "", "" );
-               goto error_return;
+               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);
 
-       /* XXX delete from parent's id2children entry XXX */
-       pdn = dn_parent( be, dn );
-       matched = NULL;
-       p = dn2entry_r( be, pdn, &matched );
+       /* delete from parent's id2children entry */
+       if( (pdn = dn_parent( be, dn )) != NULL ) {
+               if( (p = dn2entry_w( be, pdn, &matched )) == NULL) {
+                       Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
+                               0, 0, 0);
+                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                               "", "");
+                       goto return_results;
+               }
+
+#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
+               /* check parent for "children" acl */
+               if ( ! access_allowed( be, conn, op, p, "children", NULL,
+                       op->o_dn, ACL_WRITE ) )
+               {
+                       Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
+                               0, 0 );
+                       send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
+                               "", "" );
+                       goto return_results;
+               }
+#endif
+
+       } else {
+               /* no parent, must be root to delete */
+               if( ! be_isroot( be, op->o_dn ) ) {
+                       Debug( LDAP_DEBUG_TRACE, "no parent & not root\n",
+                               0, 0, 0);
+                       send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
+                               "", "");
+                       goto return_results;
+               }
+
+               pthread_mutex_lock(&li->li_root_mutex);
+               rootlock = 1;
+       }
+
        if ( id2children_remove( be, p, e ) != 0 ) {
+               Debug(LDAP_DEBUG_ARGS,
+                       "<=- ldbm_back_delete: operations error %s\n",
+                       dn, 0, 0);
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "","" );
-                goto error_return;
+               goto return_results;
        }
 
        /* delete from dn2id mapping */
@@ -79,7 +119,7 @@ ldbm_back_delete(
                        "<=- ldbm_back_delete: operations error %s\n",
                        dn, 0, 0);
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-               goto error_return;
+               goto return_results;
        }
 
        /* delete from disk and cache */
@@ -88,24 +128,28 @@ ldbm_back_delete(
                        "<=- ldbm_back_delete: operations error %s\n",
                        dn, 0, 0);
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-               goto error_return;
+               goto return_results;
        }
 
-       /* free entry and writer lock */
-       cache_return_entry_w( &li->li_cache, e );
-       if ( p )
-               cache_return_entry_r( &li->li_cache, p );
-
        send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
+       rc = 0;
+
+return_results:;
+       if ( pdn != NULL ) free(pdn);
 
-       return( 0 );
+       if( p != NULL ) {
+               /* free parent and writer lock */
+               cache_return_entry_w( &li->li_cache, p );
+
+       } else if ( rootlock ) {
+               /* release root lock */
+               pthread_mutex_unlock(&li->li_root_mutex);
+       }
 
-error_return:;
        /* free entry and writer lock */
        cache_return_entry_w( &li->li_cache, e );
 
-       if( p )
-               cache_return_entry_r( &li->li_cache, p );
+       if ( matched != NULL ) free(matched);
 
-       return( -1 );
+       return rc;
 }