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 1749c0975c5a5728e2d4cbf5cc2886bb76f28da7..70f4cee5e073897d73b8014ae28fefed7ac4cc07 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -45,12 +45,12 @@ do_delete(
     SlapReply  *rs
 )
 {
-       struct berval dn = { 0, NULL };
-       struct berval pdn = { 0, NULL };
-       struct berval org_req_dn = { 0, NULL };
-       struct berval org_req_ndn = { 0, NULL };
-       struct berval org_dn = { 0, NULL };
-       struct berval org_ndn = { 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;
 
@@ -138,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 );
 
@@ -151,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;
        }
@@ -204,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 };
@@ -240,7 +238,8 @@ do_delete(
                        op->o_managedsait = 1;
 
                        while ( rs->sr_err == LDAP_SUCCESS &&
-                                       op->o_delete_glue_parent ) {
+                               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 };
@@ -264,18 +263,9 @@ do_delete(
 
 #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 );
-                               }
-                       } else {
-                               defref = op->o_bd->be_update_refs
-                                       ? op->o_bd->be_update_refs : default_referral;
-                       }
+                       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 );
@@ -284,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
                }