Diff for /libraries/libldap/sasl.c between versions 1.41.2.1 and 1.45

version 1.41.2.1, 2002/04/15 15:21:48 version 1.45, 2002/11/28 15:15:27
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.42 2002/04/01 20:28:02 julius Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.44 2002/07/11 18:33:26 julius Exp $ */
 /*  /*
  * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 62  ldap_sasl_bind( Line 62  ldap_sasl_bind(
         int rc;          int rc;
   
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
         LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind\n" ));          LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind\n", 0, 0, 0 );
 #else  #else
         Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );          Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );
 #endif  #endif
Line 75  ldap_sasl_bind( Line 75  ldap_sasl_bind(
         rc = ldap_int_client_controls( ld, cctrls );          rc = ldap_int_client_controls( ld, cctrls );
         if( rc != LDAP_SUCCESS ) return rc;          if( rc != LDAP_SUCCESS ) return rc;
   
         if( msgidp == NULL ) {  
                 ld->ld_errno = LDAP_PARAM_ERROR;  
                 return ld->ld_errno;  
         }  
   
         if( mechanism == LDAP_SASL_SIMPLE ) {          if( mechanism == LDAP_SASL_SIMPLE ) {
                 if( dn == NULL && cred != NULL ) {                  if( dn == NULL && cred != NULL ) {
                         /* use default binddn */                          /* use default binddn */
Line 110  ldap_sasl_bind( Line 105  ldap_sasl_bind(
                         ld->ld_version, dn, LDAP_AUTH_SIMPLE,                          ld->ld_version, dn, LDAP_AUTH_SIMPLE,
                         cred );                          cred );
                                   
         } else if ( cred == NULL || !cred->bv_len ) {          } else if ( cred == NULL ) {
                 /* SASL bind w/o creditials */                  /* SASL bind w/o creditials */
                 rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/,                  rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/,
                         ++ld->ld_msgid, LDAP_REQ_BIND,                          ++ld->ld_msgid, LDAP_REQ_BIND,
Line 174  ldap_sasl_bind_s( Line 169  ldap_sasl_bind_s(
         struct berval   *scredp = NULL;          struct berval   *scredp = NULL;
   
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
         LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind_s\n" ));          LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind_s\n", 0, 0, 0 );
 #else  #else
         Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 );          Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 );
 #endif  #endif
Line 260  ldap_parse_sasl_bind_result( Line 255  ldap_parse_sasl_bind_result(
         BerElement      *ber;          BerElement      *ber;
   
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
         LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_parse_sasl_bind_result\n" ));          LDAP_LOG ( TRANSPORT, ENTRY, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
 #else  #else
         Debug( LDAP_DEBUG_TRACE, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );          Debug( LDAP_DEBUG_TRACE, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
 #endif  #endif
Line 269  ldap_parse_sasl_bind_result( Line 264  ldap_parse_sasl_bind_result(
         assert( LDAP_VALID( ld ) );          assert( LDAP_VALID( ld ) );
         assert( res != NULL );          assert( res != NULL );
   
         if ( ld == NULL || res == NULL ) {  
                 return LDAP_PARAM_ERROR;  
         }  
   
         if( servercredp != NULL ) {          if( servercredp != NULL ) {
                 if( ld->ld_version < LDAP_VERSION2 ) {                  if( ld->ld_version < LDAP_VERSION2 ) {
                         return LDAP_NOT_SUPPORTED;                          return LDAP_NOT_SUPPORTED;
Line 377  ldap_pvt_sasl_getmechs ( LDAP *ld, char Line 368  ldap_pvt_sasl_getmechs ( LDAP *ld, char
         int rc;          int rc;
   
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
         LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_getmech\n" ));          LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
 #else  #else
         Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );          Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
 #endif  #endif
Line 465  ldap_sasl_interactive_bind_s( Line 456  ldap_sasl_interactive_bind_s(
                 }                  }
   
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
                 LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1,                   LDAP_LOG ( TRANSPORT, DETAIL1, 
                         "ldap_interactive_sasl_bind_s: server supports: %s\n", smechs ));                          "ldap_interactive_sasl_bind_s: server supports: %s\n", 
                           smechs, 0, 0 );
 #else  #else
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
                         "ldap_interactive_sasl_bind_s: server supports: %s\n",                          "ldap_interactive_sasl_bind_s: server supports: %s\n",
Line 477  ldap_sasl_interactive_bind_s( Line 469  ldap_sasl_interactive_bind_s(
   
         } else {          } else {
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
                 LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1,                   LDAP_LOG ( TRANSPORT, DETAIL1, 
                         "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs ));                          "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs, 0, 0 );
 #else  #else
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
                         "ldap_interactive_sasl_bind_s: user selected: %s\n",                          "ldap_interactive_sasl_bind_s: user selected: %s\n",

Removed from v.1.41.2.1  
changed lines
  Added in v.1.45


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