Diff for /libraries/libldap/sasl.c between versions 1.74 and 1.75

version 1.74, 2009/10/26 17:49:42 version 1.75, 2009/10/26 18:19:20
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.73 2009/01/21 23:40:21 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.74 2009/10/26 17:49:42 hyc Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1998-2009 The OpenLDAP Foundation.   * Copyright 1998-2009 The OpenLDAP Foundation.
Line 679  sb_sasl_generic_write( Sockbuf_IO_Desc * Line 679  sb_sasl_generic_write( Sockbuf_IO_Desc *
 {  {
         struct sb_sasl_generic_data     *p;          struct sb_sasl_generic_data     *p;
         int                             ret;          int                             ret;
         ber_len_t                       len2, sent;          ber_len_t                       len2;
   
         assert( sbiod != NULL );          assert( sbiod != NULL );
         assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );          assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );
   
         p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt;          p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt;
   
         /* Are there anything left in the buffer? */          /* Is there anything left in the buffer? */
         if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {          if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
                 ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );                  ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );
                 if ( ret < 0 ) return ret;                  if ( ret < 0 ) return ret;
Line 725  sb_sasl_generic_write( Sockbuf_IO_Desc * Line 725  sb_sasl_generic_write( Sockbuf_IO_Desc *
                 return -1;                  return -1;
         }          }
   
         sent = ber_pvt_sb_do_write( sbiod, &p->buf_out );          ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );
   
         if ( sent < 0 ) {          if ( ret < 0 ) {
                 /* error? */                  /* error? */
                 len2 = sent;                  return ret;
         } else if ( sent != p->buf_out.buf_end ) {          } else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
                 /* partial write? */                  /* partial write? */
                 len2--;                  len2--;
                 p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE;                  p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE;

Removed from v.1.74  
changed lines
  Added in v.1.75


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