fix typo in write timeouts argnumbers

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

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index 92cce0a749d5dd7b6a844d025ceafe275eb9bfd5..17836b4aa17b61c8376c6175996fa61b056447b7 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -36,16 +36,18 @@ ldap_back_modrdn(
                Operation       *op,
                SlapReply       *rs )
 {
-       struct ldapconn *lc;
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+
+       ldapconn_t      *lc;
        ber_int_t       msgid;
        LDAPControl     **ctrls = NULL;
        int             do_retry = 1;
        int             rc = LDAP_SUCCESS;
        char            *newSup = NULL;
 
-       lc = ldap_back_getconn( op, rs );
-       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
-               return( -1 );
+       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
+       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+               return rs->sr_err;
        }
 
        if ( op->orr_newSup ) {
@@ -67,10 +69,11 @@ 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, 1 );
+       rc = ldap_back_op_result( lc, op, rs, msgid,
+               li->li_timeout[ LDAP_BACK_OP_MODRDN ], LDAP_BACK_SENDRESULT );
        if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {
                do_retry = 0;
-               if ( ldap_back_retry( lc, op, rs ) ) {
+               if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                        goto retry;
                }
        }
@@ -78,6 +81,10 @@ retry:
 cleanup:
        (void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
 
+       if ( lc != NULL ) {
+               ldap_back_release_conn( op, rs, lc );
+       }
+
        return rc;
 }