]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/delete.c
Merge in all -devel changes made since branch was created.
[openldap] / servers / slapd / back-ldbm / delete.c
index c773929ffb43a64eb73ba3e3b7c28124a5655b08..7db49948bb07c7f90472e70b7158d5ca4cf6b6ef 100644 (file)
@@ -1,14 +1,19 @@
 /* delete.c - ldbm backend delete routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 #include "back-ldbm.h"
-
-extern Entry           *dn2entry();
-extern Attribute       *attr_find();
+#include "proto-back-ldbm.h"
 
 int
 ldbm_back_delete(
@@ -19,49 +24,163 @@ ldbm_back_delete(
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       char            *matched = NULL;
-       Entry           *e;
+       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);
+
+               if ( matched != NULL ) {
+                       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;
+               }
+
+               send_ldap_result( conn, op, LDAP_REFERRAL,
+                       matched_dn, NULL, refs, NULL );
 
-       if ( (e = dn2entry( be, dn, &matched )) == NULL ) {
-               send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, matched, "" );
                if ( matched != NULL ) {
-                       free( matched );
+                       ber_bvecfree( refs );
+                       free( matched_dn );
                }
+
                return( -1 );
        }
 
-       if ( has_children( be, e ) ) {
-               send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF, "",
-                   "" );
-               cache_return_entry( &li->li_cache, e );
-               return( -1 );
+#ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
+       if ( ! access_allowed( be, conn, op, e,
+               "entry", NULL, ACL_WRITE ) )
+       {
+               Debug(LDAP_DEBUG_ARGS,
+                       "<=- ldbm_back_delete: insufficient access %s\n",
+                       dn, 0, 0);
+               send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
+                       NULL, NULL, NULL, NULL );
+               goto return_results;
        }
+#endif
 
-       if ( ! access_allowed( be, conn, op, e, "entry", NULL, op->o_dn,
-           ACL_WRITE ) ) {
-               send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, "", "" );
-               cache_return_entry( &li->li_cache, e );
-               return( -1 );
+    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;
        }
 
-       /* XXX delete from parent's id2children entry XXX */
+
+       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, e->e_ndn )) != NULL ) {
+               if( (p = dn2entry_w( be, pdn, &matched )) == NULL) {
+                       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;
+               }
+
+               /* check parent for "children" acl */
+               if ( ! access_allowed( be, conn, op, p,
+                       "children", NULL, ACL_WRITE ) )
+               {
+                       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;
+               }
+
+       } else {
+               /* no parent, must be root to delete */
+               if( ! be_isroot( be, op->o_ndn ) ) {
+                       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;
+               }
+
+               ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
+               rootlock = 1;
+       }
 
        /* delete from dn2id mapping */
-       if ( dn2id_delete( be, e->e_dn ) != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-               cache_return_entry( &li->li_cache, e );
-               return( -1 );
+       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,
+                       NULL, NULL, NULL, NULL );
+               goto return_results;
        }
 
        /* delete from disk and cache */
        if ( id2entry_delete( be, e ) != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-               cache_return_entry( &li->li_cache, e );
-               return( -1 );
+               Debug(LDAP_DEBUG_ARGS,
+                       "<=- ldbm_back_delete: operations error %s\n",
+                       dn, 0, 0);
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
+               goto return_results;
        }
-       cache_return_entry( &li->li_cache, e );
 
-       send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
+       send_ldap_result( conn, op, LDAP_SUCCESS,
+               NULL, NULL, NULL, NULL );
+       rc = 0;
+
+return_results:;
+       if ( pdn != NULL ) free(pdn);
+
+       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);
+       }
+
+       /* free entry and writer lock */
+       cache_return_entry_w( &li->li_cache, e );
+
+       if ( matched != NULL ) free(matched);
 
-       return( 0 );
+       return rc;
 }