Diff for /libraries/libldap/sasl.c between versions 1.64.2.7 and 1.64.2.10

version 1.64.2.7, 2009/10/31 00:11:22 version 1.64.2.10, 2011/01/03 22:00:15
Line 1 Line 1
 /* $OpenLDAP$ */  /* $OpenLDAP$ */
 /* 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-2010 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 422  ldap_sasl_interactive_bind_s( Line 422  ldap_sasl_interactive_bind_s(
         int rc;          int rc;
         char *smechs = NULL;          char *smechs = NULL;
   
 #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )  #if defined( HAVE_CYRUS_SASL )
         ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );          LDAP_MUTEX_LOCK( &ldap_int_sasl_mutex );
 #endif  #endif
 #ifdef LDAP_CONNECTIONLESS  #ifdef LDAP_CONNECTIONLESS
         if( LDAP_IS_UDP(ld) ) {          if( LDAP_IS_UDP(ld) ) {
Line 466  ldap_sasl_interactive_bind_s( Line 466  ldap_sasl_interactive_bind_s(
                 flags, interact, defaults );                  flags, interact, defaults );
   
 done:  done:
 #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )  #if defined( HAVE_CYRUS_SASL )
         ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );          LDAP_MUTEX_UNLOCK( &ldap_int_sasl_mutex );
 #endif  #endif
         if ( smechs ) LDAP_FREE( smechs );          if ( smechs ) LDAP_FREE( smechs );
   
Line 733  sb_sasl_generic_write( Sockbuf_IO_Desc * Line 733  sb_sasl_generic_write( Sockbuf_IO_Desc *
                 return ret;                  return ret;
         } else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {          } else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
                 /* partial write? pretend nothing got written */                  /* partial write? pretend nothing got written */
                 len2 = 0;  
                 p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE;                  p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE;
                   sock_errset(EAGAIN);
                   len2 = -1;
         }          }
   
         /* return number of bytes encoded, not written, to ensure          /* return number of bytes encoded, not written, to ensure

Removed from v.1.64.2.7  
changed lines
  Added in v.1.64.2.10


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