allow backwards compatibility for 'T' option (single char)

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index e0a5c38fda7f6119645ac538f6486be96b36b491..70f4cee5e073897d73b8014ae28fefed7ac4cc07 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
 #include "lutil.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 int
@@ -45,7 +45,13 @@ do_delete(
     SlapReply  *rs
 )
 {
-       struct berval dn = { 0, NULL };
+       struct berval dn = BER_BVNULL;
+       struct berval pdn = BER_BVNULL;
+       struct berval org_req_dn = BER_BVNULL;
+       struct berval org_req_ndn = BER_BVNULL;
+       struct berval org_dn = BER_BVNULL;
+       struct berval org_ndn = BER_BVNULL;
+       int     org_managedsait;
        int manageDSAit;
 
 #ifdef NEW_LOGGING
@@ -132,7 +138,8 @@ do_delete(
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       if ( (op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 )) == NULL ) {
+       op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+       if ( op->o_bd == NULL ) {
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 
@@ -145,7 +152,7 @@ do_delete(
                        if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
                } else {
                        send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
-                                       "referral missing" );
+                               "no global superior knowledge" );
                }
                goto cleanup;
        }
@@ -168,7 +175,7 @@ do_delete(
                slapi_pblock_set( pb, SLAPI_DELETE_TARGET, (void *)dn.bv_val );
                slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
 
-               rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_DELETE_FN, pb );
+               rs->sr_err = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_DELETE_FN, pb );
                if ( rs->sr_err < 0 ) {
                        /*
                         * A preoperation plugin failure will abort the
@@ -198,12 +205,9 @@ do_delete(
         */
        if ( op->o_bd->be_delete ) {
                /* do the update here */
-               int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+               int repl_user = be_isupdate( op );
 #ifndef SLAPD_MULTIMASTER
-               if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ) &&
-                       ( !op->o_bd->be_update_ndn.bv_len || repl_user ))
-#else
-               if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ))
+               if ( !SLAP_SHADOW(op->o_bd) || repl_user )
 #endif
                {
                        slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
@@ -221,21 +225,47 @@ do_delete(
                                cb.sc_next = op->o_callback;
                                op->o_callback = &cb;
                        }
+
                        op->o_bd->be_delete( op, rs );
-#ifndef SLAPD_MULTIMASTER
-               } else {
-                       BerVarray defref = NULL;
-                       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( &defref, &tmpbv );
+
+                       org_req_dn = op->o_req_dn;
+                       org_req_ndn = op->o_req_ndn;
+                       org_dn = op->o_dn;
+                       org_ndn = op->o_ndn;
+                       org_managedsait = get_manageDSAit( op );
+                       op->o_dn = op->o_bd->be_rootdn;
+                       op->o_ndn = op->o_bd->be_rootndn;
+                       op->o_managedsait = 1;
+
+                       while ( rs->sr_err == LDAP_SUCCESS &&
+                               op->o_delete_glue_parent )
+                       {
+                               op->o_delete_glue_parent = 0;
+                               if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) {
+                                       slap_callback cb = { NULL };
+                                       cb.sc_response = slap_null_cb;
+                                       dnParent( &op->o_req_ndn, &pdn );
+                                       op->o_req_dn = pdn;
+                                       op->o_req_ndn = pdn;
+                                       op->o_callback = &cb;
+                                       op->o_bd->be_delete( op, rs );
+                               } else {
+                                       break;
                                }
-                       } else {
-                               defref = op->o_bd->be_update_refs
-                                       ? op->o_bd->be_update_refs : default_referral;
                        }
+
+                       op->o_managedsait = org_managedsait;
+                       op->o_dn = org_dn;
+                       op->o_ndn = org_ndn;
+                       op->o_req_dn = org_req_dn;
+                       op->o_req_ndn = org_req_ndn;
+                       op->o_delete_glue_parent = 0;
+
+#ifndef SLAPD_MULTIMASTER
+               } else {
+                       BerVarray defref = op->o_bd->be_update_refs
+                               ? op->o_bd->be_update_refs : default_referral;
+
                        if ( defref != NULL ) {
                                rs->sr_ref = referral_rewrite( defref,
                                        NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
@@ -244,10 +274,11 @@ do_delete(
                                send_ldap_result( op, rs );
 
                                if (rs->sr_ref != defref) ber_bvarray_free( rs->sr_ref );
+
                        } else {
                                send_ldap_error( op, rs,
-                                               LDAP_UNWILLING_TO_PERFORM,
-                                               "referral missing" );
+                                       LDAP_UNWILLING_TO_PERFORM,
+                                       "shadow context; no update referral" );
                        }
 #endif
                }
@@ -258,7 +289,7 @@ do_delete(
        }
 
 #if defined( LDAP_SLAPI )
-       if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_DELETE_FN, pb ) < 0) {
+       if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_DELETE_FN, pb ) < 0) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, INFO, "do_delete: delete postoperation plugins "
                                "failed\n", 0, 0, 0 );