Diff for /libraries/libldap/sasl.c between versions 1.1.4.7 and 1.1.4.8

version 1.1.4.7, 2000/10/11 02:29:13 version 1.1.4.8, 2001/06/25 04:56:08
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.1.4.6 2000/09/15 16:12:56 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.1.4.7 2000/10/11 02:29:13 kurt Exp $ */
 /*  /*
  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 37 Line 37
   
 #include "ldap-int.h"  #include "ldap-int.h"
   
   
 /*  /*
  * ldap_sasl_bind - bind to the ldap server (and X.500).   * ldap_sasl_bind - bind to the ldap server (and X.500).
  * The dn (usually NULL), mechanism, and credentials are provided.   * The dn (usually NULL), mechanism, and credentials are provided.
Line 417  ldap_sasl_interactive_bind_s( Line 416  ldap_sasl_interactive_bind_s(
 {  {
         int rc;          int rc;
   
   #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
           ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );
   #endif
   
         if( mechs == NULL || *mechs == '\0' ) {          if( mechs == NULL || *mechs == '\0' ) {
                 char *smechs;                  char *smechs;
   
                 rc = ldap_pvt_sasl_getmechs( ld, &smechs );                  rc = ldap_pvt_sasl_getmechs( ld, &smechs );
   
                 if( rc != LDAP_SUCCESS ) {                  if( rc != LDAP_SUCCESS ) {
                         return rc;                          goto done;
                 }                  }
   
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
Line 442  ldap_sasl_interactive_bind_s( Line 445  ldap_sasl_interactive_bind_s(
                 serverControls, clientControls,                  serverControls, clientControls,
                 flags, interact, defaults );                  flags, interact, defaults );
   
   done:
   #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
           ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );
   #endif
   
         return rc;          return rc;
 }  }

Removed from v.1.1.4.7  
changed lines
  Added in v.1.1.4.8


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