Diff for /libraries/libldap/sasl.c between versions 1.82 and 1.84

version 1.82, 2010/10/13 23:29:32 version 1.84, 2011/01/04 23:43:05
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.81 2010/10/13 06:43:16 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.83 2010/10/13 23:47:09 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-2010 The OpenLDAP Foundation.   * Copyright 1998-2011 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 451  ldap_sasl_interactive_bind( Line 451  ldap_sasl_interactive_bind(
 #endif  #endif
                                   
         if( mechs == NULL || *mechs == '\0' ) {          if( mechs == NULL || *mechs == '\0' ) {
                   /* FIXME: this needs to be asynchronous too;
                    * perhaps NULL should be disallowed for async usage?
                    */
                 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;
                 }                  }
   
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
                         "ldap_sasl_interactive_bind_s: server supports: %s\n",                          "ldap_sasl_interactive_bind: server supports: %s\n",
                         smechs, 0, 0 );                          smechs, 0, 0 );
   
                 mechs = smechs;                  mechs = smechs;
   
         } else {          } else {
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
                         "ldap_sasl_interactive_bind_s: user selected: %s\n",                          "ldap_sasl_interactive_bind: user selected: %s\n",
                         mechs, 0, 0 );                          mechs, 0, 0 );
         }          }
         }          }
Line 509  ldap_sasl_interactive_bind_s( Line 512  ldap_sasl_interactive_bind_s(
                         serverControls, clientControls,                          serverControls, clientControls,
                         flags, interact, defaults, result, &rmech, &msgid );                          flags, interact, defaults, result, &rmech, &msgid );
   
                   ldap_msgfree( result );
   
                 if ( rc != LDAP_SASL_BIND_IN_PROGRESS )                  if ( rc != LDAP_SASL_BIND_IN_PROGRESS )
                         break;                          break;
   

Removed from v.1.82  
changed lines
  Added in v.1.84


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