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

version 1.41, 2002/01/04 20:17:39 version 1.41.2.1, 2002/04/15 15:21:48
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.40 2001/12/18 00:24:31 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.42 2002/04/01 20:28:02 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 61  ldap_sasl_bind( Line 61  ldap_sasl_bind(
         BerElement      *ber;          BerElement      *ber;
         int rc;          int rc;
   
   #ifdef NEW_LOGGING
           LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind\n" ));
   #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 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 (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind_s\n" ));
   #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 251  ldap_parse_sasl_bind_result( Line 259  ldap_parse_sasl_bind_result(
         ber_tag_t tag;          ber_tag_t tag;
         BerElement      *ber;          BerElement      *ber;
   
   #ifdef NEW_LOGGING
           LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_parse_sasl_bind_result\n" ));
   #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 364  ldap_pvt_sasl_getmechs ( LDAP *ld, char Line 376  ldap_pvt_sasl_getmechs ( LDAP *ld, char
         char **values, *mechlist;          char **values, *mechlist;
         int rc;          int rc;
   
   #ifdef NEW_LOGGING
           LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_getmech\n" ));
   #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 448  ldap_sasl_interactive_bind_s( Line 464  ldap_sasl_interactive_bind_s(
                         goto done;                          goto done;
                 }                  }
   
   #ifdef NEW_LOGGING
                   LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1, 
                           "ldap_interactive_sasl_bind_s: server supports: %s\n", smechs ));
   #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",
                         smechs, 0, 0 );                          smechs, 0, 0 );
   #endif
   
                 mechs = smechs;                  mechs = smechs;
   
         } else {          } else {
   #ifdef NEW_LOGGING
                   LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1, 
                           "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs ));
   #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",
                         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.41  
changed lines
  Added in v.1.41.2.1


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