Diff for /libraries/libldap/sasl.c between versions 1.58.2.4 and 1.60

version 1.58.2.4, 2006/01/03 22:16:09 version 1.60, 2005/08/09 22:54:38
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.58.2.3 2005/11/14 18:06:06 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.59 2005/01/01 19:49:44 kurt 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-2006 The OpenLDAP Foundation.   * Copyright 1998-2005 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 294  ldap_parse_sasl_bind_result( Line 294  ldap_parse_sasl_bind_result(
         }          }
   
         if ( ld->ld_version < LDAP_VERSION2 ) {          if ( ld->ld_version < LDAP_VERSION2 ) {
 #ifdef LDAP_NULL_IS_NULL  
                 tag = ber_scanf( ber, "{iA}",  
                         &errcode, &ld->ld_error );  
 #else /* ! LDAP_NULL_IS_NULL */  
                 tag = ber_scanf( ber, "{ia}",                  tag = ber_scanf( ber, "{ia}",
                         &errcode, &ld->ld_error );                          &errcode, &ld->ld_error );
 #endif /* ! LDAP_NULL_IS_NULL */  
   
                 if( tag == LBER_ERROR ) {                  if( tag == LBER_ERROR ) {
                         ber_free( ber, 0 );                          ber_free( ber, 0 );
Line 311  ldap_parse_sasl_bind_result( Line 306  ldap_parse_sasl_bind_result(
         } else {          } else {
                 ber_len_t len;                  ber_len_t len;
   
 #ifdef LDAP_NULL_IS_NULL  
                 tag = ber_scanf( ber, "{eAA" /*}*/,  
                         &errcode, &ld->ld_matched, &ld->ld_error );  
 #else /* ! LDAP_NULL_IS_NULL */  
                 tag = ber_scanf( ber, "{eaa" /*}*/,                  tag = ber_scanf( ber, "{eaa" /*}*/,
                         &errcode, &ld->ld_matched, &ld->ld_error );                          &errcode, &ld->ld_matched, &ld->ld_error );
 #endif /* ! LDAP_NULL_IS_NULL */  
   
                 if( tag == LBER_ERROR ) {                  if( tag == LBER_ERROR ) {
                         ber_free( ber, 0 );                          ber_free( ber, 0 );

Removed from v.1.58.2.4  
changed lines
  Added in v.1.60


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