Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c
index b3335a09c8aab0e05acf847fb2fa14cc4942452f..5e83df742567ca5dc67de124c23272ac5a17f7de 100644 (file)
--- a/servers/slapd/back-meta/delete.c
+++ b/servers/slapd/back-meta/delete.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2008 The OpenLDAP Foundation.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -41,7 +41,7 @@ meta_back_delete( Operation *op, SlapReply *rs )
        struct berval   mdn = BER_BVNULL;
        dncookie        dc;
        int             msgid;
-       int             do_retry = 1;
+       ldap_back_send_t        retrying = LDAP_BACK_RETRYING;
        LDAPControl     **ctrls = NULL;
 
        mc = meta_back_getconn( op, rs, &candidate, LDAP_BACK_SENDERR );
@@ -76,9 +76,9 @@ retry:;
        rs->sr_err = ldap_delete_ext( mc->mc_conns[ candidate ].msc_ld,
                        mdn.bv_val, ctrls, NULL, &msgid );
        rs->sr_err = meta_back_op_result( mc, op, rs, candidate, msgid,
-               mt->mt_timeout[ SLAP_OP_DELETE ], LDAP_BACK_SENDRESULT );
-       if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
-               do_retry = 0;
+               mt->mt_timeout[ SLAP_OP_DELETE ], ( LDAP_BACK_SENDRESULT | retrying ) );
+       if ( rs->sr_err == LDAP_UNAVAILABLE && retrying ) {
+               retrying &= ~LDAP_BACK_RETRYING;
                if ( meta_back_retry( op, rs, &mc, candidate, LDAP_BACK_SENDERR ) ) {
                        /* if the identity changed, there might be need to re-authz */
                        (void)mi->mi_ldap_extra->controls_free( op, rs, &ctrls );