fix minor error message

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

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index 91a7b53f2c5ae92a74babad98640991c562b8801..4f1e67ddf87e4a68bb442e1bac69587764596024 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -33,76 +33,51 @@
 
 int
 ldap_back_delete(
-    Operation  *op,
-    SlapReply  *rs )
+               Operation       *op,
+               SlapReply       *rs )
 {
-       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
-       struct ldapconn *lc;
-       ber_int_t msgid;
-       dncookie dc;
-#ifdef LDAP_BACK_PROXY_AUTHZ 
-       LDAPControl **ctrls = NULL;
-       int rc = LDAP_SUCCESS;
-#endif /* LDAP_BACK_PROXY_AUTHZ */
+       ldapinfo_t              *li = (ldapinfo_t *)op->o_bd->be_private;
 
-       struct berval mdn = { 0, NULL };
+       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 );
-       
-       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
-               return( -1 );
+       if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
+               return rs->sr_err;
        }
 
-       /*
-        * Rewrite the request dn, if needed
-        */
-       dc.rwmap = &li->rwmap;
-#ifdef ENABLE_REWRITE
-       dc.conn = op->o_conn;
-       dc.rs = rs;
-       dc.ctx = "deleteDN";
-#else
-       dc.tofrom = 1;
-       dc.normalized = 0;
-#endif
-       if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
-               send_ldap_result( op, rs );
-               return -1;
-       }
-
-#ifdef LDAP_BACK_PROXY_AUTHZ
-       rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
+retry:
+       ctrls = op->o_ctrls;
+       rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
+               li->li_version, &li->li_idassert, op, rs, &ctrls );
        if ( rc != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
+               rc = rs->sr_err;
                goto cleanup;
        }
-#endif /* LDAP_BACK_PROXY_AUTHZ */
-
-       rs->sr_err = ldap_delete_ext( lc->ld, mdn.bv_val,
-#ifdef LDAP_BACK_PROXY_AUTHZ
-                       ctrls,
-#else /* ! LDAP_BACK_PROXY_AUTHZ */
-                       op->o_ctrls,
-#endif /* ! LDAP_BACK_PROXY_AUTHZ */
-                       NULL, &msgid );
 
-#ifdef LDAP_BACK_PROXY_AUTHZ
-cleanup:
-       if ( ctrls && ctrls != op->o_ctrls ) {
-               free( ctrls[ 0 ] );
-               free( ctrls );
+       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,
+               li->li_timeout[ SLAP_OP_DELETE ],
+               ( LDAP_BACK_SENDRESULT | retrying ) );
+       if ( rs->sr_err == LDAP_UNAVAILABLE && 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;
+               }
        }
-#endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
-               free( mdn.bv_val );
-       }
+cleanup:
+       (void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
 
-#ifdef LDAP_BACK_PROXY_AUTHZ
-       if ( rc != LDAP_SUCCESS ) {
-               send_ldap_result( op, rs );
-               return -1;
+       if ( lc != NULL ) {
+               ldap_back_release_conn( li, lc );
        }
-#endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       return( ldap_back_op_result( lc, op, rs, msgid, 1 ) );
+       return rc;
 }