Diff for /servers/slapd/back-ldap/modrdn.c between versions 1.50 and 1.51

version 1.50, 2006/06/15 21:12:38 version 1.51, 2006/06/24 14:58:49
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.49 2006/06/10 14:33:26 ando Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/modrdn.c,v 1.50 2006/06/15 21:12:38 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-2006 The OpenLDAP Foundation.   * Copyright 1999-2006 The OpenLDAP Foundation.
Line 36  ldap_back_modrdn( Line 36  ldap_back_modrdn(
                 Operation       *op,                  Operation       *op,
                 SlapReply       *rs )                  SlapReply       *rs )
 {  {
         ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;          ldapinfo_t              *li = (ldapinfo_t *)op->o_bd->be_private;
   
         ldapconn_t      *lc;          ldapconn_t              *lc;
         ber_int_t       msgid;          ber_int_t               msgid;
         LDAPControl     **ctrls = NULL;          LDAPControl             **ctrls = NULL;
         int             do_retry = 1;          ldap_back_send_t        retrying = LDAP_BACK_RETRYING;
         int             rc = LDAP_SUCCESS;          int                     rc = LDAP_SUCCESS;
         char            *newSup = NULL;          char                    *newSup = NULL;
   
         lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );          lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
         if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {          if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
Line 87  retry: Line 87  retry:
                         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,          rc = ldap_back_op_result( lc, op, rs, msgid,
                 li->li_timeout[ LDAP_BACK_OP_MODRDN ], LDAP_BACK_SENDRESULT );                  li->li_timeout[ LDAP_BACK_OP_MODRDN ],
         if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {                  ( LDAP_BACK_SENDRESULT | retrying ) );
                 do_retry = 0;          if ( rs->sr_err == LDAP_SERVER_DOWN && retrying ) {
                   retrying &= ~LDAP_BACK_RETRYING;
                 if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {                  if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                         goto retry;                          goto retry;
                 }                  }

Removed from v.1.50  
changed lines
  Added in v.1.51


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