--- libraries/libldap/sasl.c 2002/01/04 20:17:39 1.41 +++ libraries/libldap/sasl.c 2002/04/15 15:21:48 1.41.2.1 @@ -1,4 +1,4 @@ -/* $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. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file @@ -61,7 +61,11 @@ ldap_sasl_bind( BerElement *ber; 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 ); +#endif assert( ld != NULL ); assert( LDAP_VALID( ld ) ); @@ -169,7 +173,11 @@ ldap_sasl_bind_s( LDAPMessage *result; 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 ); +#endif /* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */ if( servercredp != NULL ) { @@ -251,7 +259,11 @@ ldap_parse_sasl_bind_result( ber_tag_t tag; 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 ); +#endif assert( ld != NULL ); assert( LDAP_VALID( ld ) ); @@ -364,7 +376,11 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char char **values, *mechlist; 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 ); +#endif rc = ldap_search_s( ld, "", LDAP_SCOPE_BASE, NULL, attrs, 0, &res ); @@ -448,16 +464,26 @@ ldap_sasl_interactive_bind_s( 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, "ldap_interactive_sasl_bind_s: server supports: %s\n", smechs, 0, 0 ); +#endif mechs = smechs; } 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, "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs, 0, 0 ); +#endif } rc = ldap_int_sasl_bind( ld, dn, mechs,