Diff for /servers/slapd/back-ldap/modrdn.c between versions 1.38.2.4 and 1.38.2.5

version 1.38.2.4, 2005/08/09 21:04:02 version 1.38.2.5, 2005/11/14 18:06:12
Line 1 Line 1
 /* modrdn.c - ldap backend modrdn function */  /* modrdn.c - ldap backend modrdn function */
 /* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/modrdn.c,v 1.43 2005/08/02 20:48:30 ando Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/modrdn.c,v 1.44 2005/11/06 22:29:11 ando Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1999-2005 The OpenLDAP Foundation.   * Copyright 1999-2005 The OpenLDAP Foundation.
Line 36  ldap_back_modrdn( Line 36  ldap_back_modrdn(
                 Operation       *op,                  Operation       *op,
                 SlapReply       *rs )                  SlapReply       *rs )
 {  {
           struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
   
         struct ldapconn *lc;          struct ldapconn *lc;
         ber_int_t       msgid;          ber_int_t       msgid;
         LDAPControl     **ctrls = NULL;          LDAPControl     **ctrls = NULL;
Line 67  retry: Line 69  retry:
         rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_ndn.bv_val,          rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_ndn.bv_val,
                         op->orr_newrdn.bv_val, newSup,                          op->orr_newrdn.bv_val, newSup,
                         op->orr_deleteoldrdn, ctrls, NULL, &msgid );                          op->orr_deleteoldrdn, ctrls, NULL, &msgid );
         rc = ldap_back_op_result( lc, op, rs, msgid, LDAP_BACK_SENDRESULT );          rc = ldap_back_op_result( lc, op, rs, msgid,
                   li->timeout[ LDAP_BACK_OP_MODRDN ], LDAP_BACK_SENDRESULT );
         if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {          if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {
                 do_retry = 0;                  do_retry = 0;
                 if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {                  if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {

Removed from v.1.38.2.4  
changed lines
  Added in v.1.38.2.5


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org