More ldapbis cleanup

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

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index a46616f02d3632560aa0d136c5165d670ed30b97..e759a2d3219f1f63b2838687fa31d00a2ff3583f 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -38,18 +38,17 @@ ldap_back_delete(
 {
        ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
 
-       ldapconn_t              *lc;
+       ldapconn_t              *lc = NULL;
        ber_int_t               msgid;
        LDAPControl             **ctrls = NULL;
        ldap_back_send_t        retrying = LDAP_BACK_RETRYING;
        int                     rc = LDAP_SUCCESS;
 
-       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
-       
-       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+       if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                return rs->sr_err;
        }
 
+retry:
        ctrls = op->o_ctrls;
        rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
                li->li_version, &li->li_idassert, op, rs, &ctrls );
@@ -59,7 +58,6 @@ ldap_back_delete(
                goto cleanup;
        }
 
-retry:
        rs->sr_err = ldap_delete_ext( lc->lc_ld, op->o_req_dn.bv_val,
                        ctrls, NULL, &msgid );
        rc = ldap_back_op_result( lc, op, rs, msgid,
@@ -68,6 +66,8 @@ retry:
        if ( rs->sr_err == LDAP_SERVER_DOWN && retrying ) {
                retrying &= ~LDAP_BACK_RETRYING;
                if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
+                       /* if the identity changed, there might be need to re-authz */
+                       (void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
                        goto retry;
                }
        }