--- libraries/libldap/sasl.c	2005/11/14 18:06:06	1.58.2.3
+++ libraries/libldap/sasl.c	2005/01/01 19:49:44	1.59
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.58.2.2 2005/08/10 21:57:17 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-2005 The OpenLDAP Foundation.
@@ -294,13 +294,8 @@ ldap_parse_sasl_bind_result(
 	}
 
 	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}",
 			&errcode, &ld->ld_error );
-#endif /* ! LDAP_NULL_IS_NULL */
 
 		if( tag == LBER_ERROR ) {
 			ber_free( ber, 0 );
@@ -311,13 +306,8 @@ ldap_parse_sasl_bind_result(
 	} else {
 		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, "{iaa" /*}*/,
 			&errcode, &ld->ld_matched, &ld->ld_error );
-#endif /* ! LDAP_NULL_IS_NULL */
 
 		if( tag == LBER_ERROR ) {
 			ber_free( ber, 0 );