Diff for /libraries/libldap/sasl.c between versions 1.53 and 1.58.2.1

version 1.53, 2003/09/22 21:50:33 version 1.58.2.1, 2005/01/20 18:03:50
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.58 2004/09/04 02:54:29 kurt Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.   *
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * Copyright 1998-2005 The OpenLDAP Foundation.
    * 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 66  ldap_sasl_bind( Line 74  ldap_sasl_bind(
         int rc;          int rc;
         ber_int_t id;          ber_int_t id;
   
 #ifdef NEW_LOGGING  
         LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind\n", 0, 0, 0 );  
 #else  
         Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );          Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );
 #endif  
   
         assert( ld != NULL );          assert( ld != NULL );
         assert( LDAP_VALID( ld ) );          assert( LDAP_VALID( ld ) );
Line 112  ldap_sasl_bind( Line 116  ldap_sasl_bind(
                         cred );                          cred );
                                   
         } else if ( cred == NULL || cred->bv_val == NULL ) {          } else if ( cred == NULL || cred->bv_val == NULL ) {
                 /* SASL bind w/o creditials */                  /* SASL bind w/o credentials */
                 rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/,                  rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/,
                         id, LDAP_REQ_BIND,                          id, LDAP_REQ_BIND,
                         ld->ld_version, dn, LDAP_AUTH_SASL,                          ld->ld_version, dn, LDAP_AUTH_SASL,
                         mechanism );                          mechanism );
   
         } else {          } else {
                 /* SASL bind w/ creditials */                  /* SASL bind w/ credentials */
                 rc = ber_printf( ber, "{it{ist{sON}N}" /*}*/,                  rc = ber_printf( ber, "{it{ist{sON}N}" /*}*/,
                         id, LDAP_REQ_BIND,                          id, LDAP_REQ_BIND,
                         ld->ld_version, dn, LDAP_AUTH_SASL,                          ld->ld_version, dn, LDAP_AUTH_SASL,
Line 169  ldap_sasl_bind_s( Line 173  ldap_sasl_bind_s(
         LDAPMessage     *result;          LDAPMessage     *result;
         struct berval   *scredp = NULL;          struct berval   *scredp = NULL;
   
 #ifdef NEW_LOGGING  
         LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind_s\n", 0, 0, 0 );  
 #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  
   
         /* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */          /* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */
         if( servercredp != NULL ) {          if( servercredp != NULL ) {
Line 255  ldap_parse_sasl_bind_result( Line 255  ldap_parse_sasl_bind_result(
         ber_tag_t tag;          ber_tag_t tag;
         BerElement      *ber;          BerElement      *ber;
   
 #ifdef NEW_LOGGING  
         LDAP_LOG ( TRANSPORT, ENTRY, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );  
 #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  
   
         assert( ld != NULL );          assert( ld != NULL );
         assert( LDAP_VALID( ld ) );          assert( LDAP_VALID( ld ) );
Line 368  ldap_pvt_sasl_getmechs ( LDAP *ld, char Line 364  ldap_pvt_sasl_getmechs ( LDAP *ld, char
         char **values, *mechlist;          char **values, *mechlist;
         int rc;          int rc;
   
 #ifdef NEW_LOGGING  
         LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );  
 #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  
   
         rc = ldap_search_s( ld, "", LDAP_SCOPE_BASE,          rc = ldap_search_s( ld, "", LDAP_SCOPE_BASE,
                 NULL, attrs, 0, &res );                  NULL, attrs, 0, &res );
Line 449  ldap_sasl_interactive_bind_s( Line 441  ldap_sasl_interactive_bind_s(
                 goto done;                  goto done;
         } else          } else
 #endif  #endif
   
   #ifdef HAVE_CYRUS_SASL
         if( mechs == NULL || *mechs == '\0' ) {          if( mechs == NULL || *mechs == '\0' ) {
                 mechs = ld->ld_options.ldo_def_sasl_mech;                  mechs = ld->ld_options.ldo_def_sasl_mech;
         }          }
   #endif
                                   
         if( mechs == NULL || *mechs == '\0' ) {          if( mechs == NULL || *mechs == '\0' ) {
                 rc = ldap_pvt_sasl_getmechs( ld, &smechs );                  rc = ldap_pvt_sasl_getmechs( ld, &smechs );
Line 459  ldap_sasl_interactive_bind_s( Line 454  ldap_sasl_interactive_bind_s(
                         goto done;                          goto done;
                 }                  }
   
 #ifdef NEW_LOGGING  
                 LDAP_LOG ( TRANSPORT, DETAIL1,   
                         "ldap_sasl_interactive_bind_s: server supports: %s\n",   
                         smechs, 0, 0 );  
 #else  
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
                         "ldap_sasl_interactive_bind_s: server supports: %s\n",                          "ldap_sasl_interactive_bind_s: server supports: %s\n",
                         smechs, 0, 0 );                          smechs, 0, 0 );
 #endif  
   
                 mechs = smechs;                  mechs = smechs;
   
         } else {          } else {
 #ifdef NEW_LOGGING  
                 LDAP_LOG ( TRANSPORT, DETAIL1,   
                         "ldap_sasl_interactive_bind_s: user selected: %s\n",  
                         mechs, 0, 0 );  
 #else  
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
                         "ldap_sasl_interactive_bind_s: user selected: %s\n",                          "ldap_sasl_interactive_bind_s: user selected: %s\n",
                         mechs, 0, 0 );                          mechs, 0, 0 );
 #endif  
         }          }
   
         rc = ldap_int_sasl_bind( ld, dn, mechs,          rc = ldap_int_sasl_bind( ld, dn, mechs,

Removed from v.1.53  
changed lines
  Added in v.1.58.2.1


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