]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/delete.c
fix referral return in back-ldbm as well (same as ITS#3475)
[openldap] / servers / slapd / back-ldbm / delete.c
index a8180b3cf16570a17ce6e0fb35f64457a61f3f73..01ae6c72755f5256b7a5000f60c5f96aaebc48ae 100644 (file)
@@ -1,7 +1,17 @@
 /* delete.c - ldbm backend delete routine */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 
 int
 ldbm_back_delete(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
-    char       *dn
-)
+    SlapReply  *rs )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       Entry   *matched = NULL;
-       char    *pdn = NULL;
+       struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
+       Entry   *matched;
+       struct berval   pdn;
        Entry   *e, *p = NULL;
-       int rootlock = 0;
        int     rc = -1;
        int             manageDSAit = get_manageDSAit( op );
+       AttributeDescription *children = slap_schema.si_ad_children;
+       AttributeDescription *entry = slap_schema.si_ad_entry;
 
-       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn, 0, 0);
+       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", op->o_req_dn.bv_val, 0, 0);
+
+       /* grab giant lock for writing */
+       ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
 
        /* get entry with writer lock */
-       if ( (e = dn2entry_w( be, dn, &matched )) == NULL ) {
-               char *matched_dn = NULL;
-               struct berval **refs = NULL;
+       e = dn2entry_w( op->o_bd, &op->o_req_ndn, &matched );
+
+       /* FIXME : dn2entry() should return non-glue entry */
+       if ( e == NULL || ( !manageDSAit && is_entry_glue( e ))) {
+               BerVarray deref = NULL;
 
                Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n",
-                       dn, 0, 0);
+                       op->o_req_dn.bv_val, 0, 0);
 
                if ( matched != NULL ) {
-                       matched_dn = ch_strdup( matched->e_dn );
-                       refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched )
+                       rs->sr_matched = ch_strdup( matched->e_dn );
+                       rs->sr_ref = is_entry_referral( matched )
+                               ? get_entry_referrals( op, matched )
                                : NULL;
                        cache_return_entry_r( &li->li_cache, matched );
+
                } else {
-                       refs = default_referral;
+                       if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
+                               syncinfo_t *si;
+                               LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
+                                       struct berval tmpbv;
+                                       ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
+                                       ber_bvarray_add( &deref, &tmpbv );
+                               }
+                       } else {
+                               deref = default_referral;
+                       }
+                       rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
+                                                       LDAP_SCOPE_DEFAULT );
                }
 
-               send_ldap_result( conn, op, LDAP_REFERRAL,
-                       matched_dn, NULL, refs, NULL );
+               ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
 
-               if ( matched != NULL ) {
-                       ber_bvecfree( refs );
-                       free( matched_dn );
-               }
+               rs->sr_err = LDAP_REFERRAL;
+               send_ldap_result( op, rs );
 
+               if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+               if ( deref != default_referral ) {
+                       ber_bvarray_free( deref );
+               }
+               free( (char *)rs->sr_matched );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
                return( -1 );
        }
 
-#ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
-       if ( ! access_allowed( be, conn, op, e,
-               "entry", NULL, ACL_WRITE ) )
+       /* check entry for "entry" acl */
+       if ( ! access_allowed( op, e,
+               entry, NULL, ACL_WRITE, NULL ) )
        {
-               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 );
+               Debug( LDAP_DEBUG_TRACE,
+                       "<=- ldbm_back_delete: no write access to entry\n", 0,
+                       0, 0 );
+
+               send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+                       "no write access to entry" );
+
+               rc = LDAP_INSUFFICIENT_ACCESS;
                goto return_results;
        }
-#endif
 
-    if ( !manageDSAit && is_entry_referral( e ) ) {
+       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 );
+               rs->sr_ref = get_entry_referrals( 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 );
+               rs->sr_err = LDAP_REFERRAL;
+               rs->sr_matched = e->e_name.bv_val;
+               send_ldap_result( op, rs );
 
-               rc = 1;
+               if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
+               rc = LDAP_REFERRAL;
                goto return_results;
        }
 
-
-       if ( has_children( be, e ) ) {
+       if ( has_children( op->o_bd, 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 );
+                       op->o_req_dn.bv_val, 0, 0);
+
+               send_ldap_error( op, rs, LDAP_NOT_ALLOWED_ON_NONLEAF,
+                       "subtree delete not supported" );
                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) {
+       if( !be_issuffix( op->o_bd, &e->e_nname ) && (dnParent( &e->e_nname, &pdn ),
+               pdn.bv_len) ) {
+               if( (p = dn2entry_w( op->o_bd, &pdn, NULL )) == 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 );
+
+                       send_ldap_error( op, rs, LDAP_OTHER,
+                               "could not locate parent of entry" );
                        goto return_results;
                }
 
                /* check parent for "children" acl */
-               if ( ! access_allowed( be, conn, op, p,
-                       "children", NULL, ACL_WRITE ) )
+               if ( ! access_allowed( op, p,
+                       children, NULL, ACL_WRITE, NULL ) )
                {
                        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 );
+
+                       send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+                               "no write access to parent" );
                        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;
+               if( ! be_isroot( op ) ) {
+                       if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv )
+                               || be_shadow_update( op ) ) {
+                               p = (Entry *)&slap_entry_root;
+                               
+                               rc = access_allowed( op, p,
+                                       children, NULL, ACL_WRITE, NULL );
+                               p = NULL;
+                                                               
+                               /* check parent for "children" acl */
+                               if ( ! rc ) {
+                                       Debug( LDAP_DEBUG_TRACE,
+                                               "<=- ldbm_back_delete: no "
+                                               "access to parent\n", 0, 0, 0 );
+
+                                       send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+                                               "no write access to parent" );
+                                       goto return_results;
+                               }
+
+                       } else {
+                               Debug( LDAP_DEBUG_TRACE,
+                                       "<=- ldbm_back_delete: no parent & "
+                                       "not root\n", 0, 0, 0);
+
+                               send_ldap_error( op, rs,
+                                       LDAP_INSUFFICIENT_ACCESS,
+                                       NULL );
+                               goto return_results;
+                       }
                }
-
-               ldap_pvt_thread_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,
-                       NULL, NULL, NULL, NULL );
-               goto return_results;
        }
 
        /* delete from dn2id mapping */
-       if ( dn2id_delete( be, e->e_ndn ) != 0 ) {
+       if ( dn2id_delete( op->o_bd, &e->e_nname, e->e_id ) != 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 );
+                       op->o_req_dn.bv_val, 0, 0);
+
+               send_ldap_error( op, rs, LDAP_OTHER,
+                       "DN index delete failed" );
                goto return_results;
        }
 
        /* delete from disk and cache */
-       if ( id2entry_delete( be, e ) != 0 ) {
+       if ( id2entry_delete( op->o_bd, e ) != 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 );
+                       op->o_req_dn.bv_val, 0, 0);
+
+               send_ldap_error( op, rs, LDAP_OTHER,
+                       "entry delete failed" );
                goto return_results;
        }
 
-       send_ldap_result( conn, op, LDAP_SUCCESS,
-               NULL, NULL, NULL, NULL );
-       rc = 0;
+       /* delete attribute indices */
+       (void) index_entry_del( op, e );
 
-return_results:;
-       if ( pdn != NULL ) free(pdn);
+       rs->sr_err = LDAP_SUCCESS;
+       send_ldap_result( op, rs );
+       rc = LDAP_SUCCESS;
 
+return_results:;
        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);
+       ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
 
        return rc;
 }