Diff for /libraries/libldap/sasl.c between versions 1.50.2.4 and 1.52

version 1.50.2.4, 2004/01/01 18:16:30 version 1.52, 2003/07/28 18:25:44
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.50.2.3 2003/12/01 00:58:26 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.51 2003/07/07 03:14:03 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /*
  *   * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * Copyright 1998-2004 The OpenLDAP Foundation.   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  * All rights reserved.  
  *  
  * Redistribution and use in source and binary forms, with or without  
  * modification, are permitted only as authorized by the OpenLDAP  
  * Public License.  
  *  
  * A copy of this license is available in the file LICENSE in the  
  * top-level directory of the distribution or, alternatively, at  
  * <http://www.OpenLDAP.org/license.html>.  
  */   */
 /* Portions Copyright (C) The Internet Society (1997)  /*
    * Portions Copyright (C) The Internet Society (1997)
  * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.   * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
  */   */
   
Line 441  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 457  ldap_sasl_interactive_bind_s( Line 448  ldap_sasl_interactive_bind_s(
                 goto done;                  goto done;
         } else          } else
 #endif  #endif
   
 #ifdef HAVE_CYRUS_SASL  
         if( mechs == NULL || *mechs == '\0' ) {  
                 mechs = ld->ld_options.ldo_def_sasl_mech;  
         }  
 #endif  
                   
         if( mechs == NULL || *mechs == '\0' ) {          if( mechs == NULL || *mechs == '\0' ) {
                   char *smechs;
   
                 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 502  done: Line 488  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.4  
changed lines
  Added in v.1.52


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