fix referral return in back-ldbm as well (same as ITS#3475)

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

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 0e97d74e62f13a64e8455bb53746829c87d1d6ef..01ae6c72755f5256b7a5000f60c5f96aaebc48ae 100644 (file)
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,11 +39,7 @@ ldbm_back_delete(
        AttributeDescription *children = slap_schema.si_ad_children;
        AttributeDescription *entry = slap_schema.si_ad_entry;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_delete: %s\n", op->o_req_dn.bv_val, 0, 0 );
-#else
        Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", op->o_req_dn.bv_val, 0, 0);
-#endif
 
        /* grab giant lock for writing */
        ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
@@ -53,13 +49,10 @@ ldbm_back_delete(
 
        /* FIXME : dn2entry() should return non-glue entry */
        if ( e == NULL || ( !manageDSAit && is_entry_glue( e ))) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDBM, INFO, 
-                       "ldbm_back_delete: no such object %s\n", op->o_req_dn.bv_val, 0, 0 );
-#else
+               BerVarray deref = NULL;
+
                Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n",
                        op->o_req_dn.bv_val, 0, 0);
-#endif
 
                if ( matched != NULL ) {
                        rs->sr_matched = ch_strdup( matched->e_dn );
@@ -69,7 +62,6 @@ ldbm_back_delete(
                        cache_return_entry_r( &li->li_cache, matched );
 
                } else {
-                       BerVarray deref = NULL;
                        if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
                                syncinfo_t *si;
                                LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
@@ -81,7 +73,7 @@ ldbm_back_delete(
                                deref = default_referral;
                        }
                        rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
-                                                               LDAP_SCOPE_DEFAULT );
+                                                       LDAP_SCOPE_DEFAULT );
                }
 
                ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
@@ -90,6 +82,9 @@ ldbm_back_delete(
                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;
@@ -100,15 +95,9 @@ ldbm_back_delete(
        if ( ! access_allowed( op, e,
                entry, NULL, ACL_WRITE, NULL ) )
        {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDBM, ERR, 
-                       "ldbm_back_delete: no write access to entry of (%s)\n", 
-                       op->o_req_dn.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
                        "<=- ldbm_back_delete: no write access to entry\n", 0,
                        0, 0 );
-#endif
 
                send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
                        "no write access to entry" );
@@ -122,13 +111,8 @@ ldbm_back_delete(
                /* parent is an alias, don't allow add */
                rs->sr_ref = get_entry_referrals( op, e );
 
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDBM, INFO, 
-                       "ldbm_back_delete: entry (%s) is a referral.\n", e->e_dn, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                    0, 0 );
-#endif
 
                rs->sr_err = LDAP_REFERRAL;
                rs->sr_matched = e->e_name.bv_val;
@@ -142,13 +126,8 @@ ldbm_back_delete(
        }
 
        if ( has_children( op->o_bd, e ) ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDBM, ERR, 
-                          "ldbm_back_delete: (%s) is a non-leaf node.\n", op->o_req_dn.bv_val, 0,0);
-#else
                Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
                        op->o_req_dn.bv_val, 0, 0);
-#endif
 
                send_ldap_error( op, rs, LDAP_NOT_ALLOWED_ON_NONLEAF,
                        "subtree delete not supported" );
@@ -159,14 +138,9 @@ ldbm_back_delete(
        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) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_LDBM, ERR, 
-                               "ldbm_back_delete: parent of (%s) does not exist\n", op->o_req_dn, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- ldbm_back_delete: parent does not exist\n",
                                0, 0, 0);
-#endif
 
                        send_ldap_error( op, rs, LDAP_OTHER,
                                "could not locate parent of entry" );
@@ -177,15 +151,9 @@ ldbm_back_delete(
                if ( ! access_allowed( op, p,
                        children, NULL, ACL_WRITE, NULL ) )
                {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACK_LDBM, ERR, 
-                               "ldbm_back_delete: no access to parent of (%s)\n", 
-                               op->o_req_dn.bv_val, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- ldbm_back_delete: no access to parent\n", 0,
                                0, 0 );
-#endif
 
                        send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
                                "no write access to parent" );
@@ -194,8 +162,9 @@ ldbm_back_delete(
 
        } else {
                /* no parent, must be root to delete */
-               if( ! be_isroot_dn( op ) ) {
-                       if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv ) || be_isupdate( op->o_bd, &op->o_ndn ) ) {
+               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,
@@ -204,15 +173,9 @@ ldbm_back_delete(
                                                                
                                /* check parent for "children" acl */
                                if ( ! rc ) {
-#ifdef NEW_LOGGING
-                                       LDAP_LOG( BACK_LDBM, ERR,
-                                               "ldbm_back_delete: no access "
-                                               "to parent of ("")\n", 0, 0, 0 );
-#else
                                        Debug( LDAP_DEBUG_TRACE,
                                                "<=- ldbm_back_delete: no "
                                                "access to parent\n", 0, 0, 0 );
-#endif
 
                                        send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
                                                "no write access to parent" );
@@ -220,15 +183,9 @@ ldbm_back_delete(
                                }
 
                        } else {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( BACK_LDBM, ERR, 
-                                       "ldbm_back_delete: (%s) has no "
-                                       "parent & not a root.\n", op->o_ndn, 0, 0 );
-#else
                                Debug( LDAP_DEBUG_TRACE,
                                        "<=- ldbm_back_delete: no parent & "
                                        "not root\n", 0, 0, 0);
-#endif
 
                                send_ldap_error( op, rs,
                                        LDAP_INSUFFICIENT_ACCESS,
@@ -240,14 +197,9 @@ ldbm_back_delete(
 
        /* delete from dn2id mapping */
        if ( dn2id_delete( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDBM, ERR, 
-                       "ldbm_back_delete: (%s) operations error\n", op->o_req_dn.bv_val, 0, 0 );
-#else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_back_delete: operations error %s\n",
                        op->o_req_dn.bv_val, 0, 0);
-#endif
 
                send_ldap_error( op, rs, LDAP_OTHER,
                        "DN index delete failed" );
@@ -256,14 +208,9 @@ ldbm_back_delete(
 
        /* delete from disk and cache */
        if ( id2entry_delete( op->o_bd, e ) != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDBM, ERR, 
-                       "ldbm_back_delete: (%s) operations error\n", op->o_req_dn.bv_val, 0, 0 );
-#else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_back_delete: operations error %s\n",
                        op->o_req_dn.bv_val, 0, 0);
-#endif
 
                send_ldap_error( op, rs, LDAP_OTHER,
                        "entry delete failed" );