/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
* Portions Copyright 1999-2003 Howard Chu.
* Portions Copyright 2000-2003 Pierangelo Masarati.
* All rights reserved.
int
ldap_back_modrdn(
- 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 */
-
- struct berval mdn = { 0, NULL }, mnewSuperior = { 0, NULL };
-
- lc = ldap_back_getconn( op, rs );
- if ( !lc || !ldap_back_dobind(lc, op, rs) ) {
- return( -1 );
+ ber_int_t msgid;
+ LDAPControl **ctrls = NULL;
+ int do_retry = 1;
+ int rc = LDAP_SUCCESS;
+ char *newSup = NULL;
+
+ lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
+ if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+ return rs->sr_err;
}
- dc.rwmap = &li->rwmap;
-#ifdef ENABLE_REWRITE
- dc.conn = op->o_conn;
- dc.rs = rs;
-#else
- dc.tofrom = 1;
- dc.normalized = 0;
-#endif
- if (op->orr_newSup) {
- int version = LDAP_VERSION3;
- ldap_set_option( lc->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+ if ( op->orr_newSup ) {
+ int version = LDAP_VERSION3;
- /*
- * Rewrite the new superior, if defined and required
- */
-#ifdef ENABLE_REWRITE
- dc.ctx = "newSuperiorDN";
-#endif
- if ( ldap_back_dn_massage( &dc, op->orr_newSup,
- &mnewSuperior ) ) {
- send_ldap_result( op, rs );
- return -1;
- }
- }
-
- /*
- * Rewrite the modrdn dn, if required
- */
-#ifdef ENABLE_REWRITE
- dc.ctx = "modrDN";
-#endif
- if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
- send_ldap_result( op, rs );
- return -1;
+ ldap_set_option( lc->lc_ld, LDAP_OPT_PROTOCOL_VERSION, &version );
+ newSup = op->orr_newSup->bv_val;
}
-#ifdef LDAP_BACK_PROXY_AUTHZ
+ ctrls = op->o_ctrls;
rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
if ( rc != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
+ rc = -1;
goto cleanup;
}
-#endif /* LDAP_BACK_PROXY_AUTHZ */
-
- rs->sr_err = ldap_rename( lc->ld, mdn.bv_val,
- op->orr_newrdn.bv_val, mnewSuperior.bv_val,
- op->orr_deleteoldrdn,
-#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 );
+retry:
+ rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_ndn.bv_val,
+ op->orr_newrdn.bv_val, newSup,
+ op->orr_deleteoldrdn, ctrls, NULL, &msgid );
+ rc = ldap_back_op_result( lc, op, rs, msgid, LDAP_BACK_SENDRESULT );
+ if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {
+ do_retry = 0;
+ if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+ goto retry;
+ }
}
-#endif /* LDAP_BACK_PROXY_AUTHZ */
- if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
- free( mdn.bv_val );
- }
- if ( mnewSuperior.bv_val != NULL
- && mnewSuperior.bv_val != op->oq_modrdn.rs_newSup->bv_val ) {
- free( mnewSuperior.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( op, rs, lc );
}
-#endif /* LDAP_BACK_PROXY_AUTHZ */
- return( ldap_back_op_result( lc, op, rs, msgid, 1 ) );
+ return rc;
}