Diff for /libraries/libldap/sasl.c between versions 1.50.2.1 and 1.50.2.2

version 1.50.2.1, 2003/09/18 15:43:32 version 1.50.2.2, 2003/10/06 14:57:29
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.52 2003/07/28 18:25:44 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.50.2.1 2003/09/18 15:43:32 kurt Exp $ */
 /*  /*
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 433  ldap_sasl_interactive_bind_s( Line 433  ldap_sasl_interactive_bind_s(
         void *defaults )          void *defaults )
 {  {
         int rc;          int rc;
           char *smechs = NULL;
   
 #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )  #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
         ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );          ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );
Line 448  ldap_sasl_interactive_bind_s( Line 449  ldap_sasl_interactive_bind_s(
                 goto done;                  goto done;
         } else          } else
 #endif  #endif
         if( mechs == NULL || *mechs == '\0' ) {  
                 char *smechs;  
   
   #ifdef HAVE_CYRUS_SASL
           if( mechs == NULL || *mechs == '\0' ) {
                   mechs = ld->ld_options.ldo_def_sasl_mech;
           }
   #endif
                   
           if( mechs == NULL || *mechs == '\0' ) {
                 rc = ldap_pvt_sasl_getmechs( ld, &smechs );                  rc = ldap_pvt_sasl_getmechs( ld, &smechs );
                 if( rc != LDAP_SUCCESS ) {                  if( rc != LDAP_SUCCESS ) {
                         goto done;                          goto done;
Line 488  done: Line 494  done:
 #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )  #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
         ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );          ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );
 #endif  #endif
           if ( smechs ) LDAP_FREE( smechs );
   
         return rc;          return rc;
 }  }

Removed from v.1.50.2.1  
changed lines
  Added in v.1.50.2.2


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