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

version 1.50.2.5, 2004/07/25 21:58:52 version 1.53, 2003/09/22 21:50:33
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.50.2.4 2004/01/01 18:16:30 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.52 2003/07/28 18:25:44 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /*
  *   * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * Copyright 1998-2004 The OpenLDAP Foundation.   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  * 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 120  ldap_sasl_bind( Line 112  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 credentials */                  /* SASL bind w/o creditials */
                 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/ credentials */                  /* SASL bind w/ creditials */
                 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 457  ldap_sasl_interactive_bind_s( Line 449  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 );

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


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