--- libraries/libldap/sasl.c	2001/07/06 01:13:43	1.36
+++ libraries/libldap/sasl.c	2002/11/28 15:15:27	1.45
@@ -1,6 +1,6 @@
-/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.35 2001/06/14 22:14:56 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.44 2002/07/11 18:33:26 julius Exp $ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -27,10 +27,10 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
 #include <stdio.h>
 
 #include <ac/socket.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/errno.h>
@@ -61,7 +61,11 @@ ldap_sasl_bind(
 	BerElement	*ber;
 	int rc;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
@@ -71,11 +75,6 @@ ldap_sasl_bind(
 	rc = ldap_int_client_controls( ld, cctrls );
 	if( rc != LDAP_SUCCESS ) return rc;
 
-	if( msgidp == NULL ) {
-		ld->ld_errno = LDAP_PARAM_ERROR;
-		return ld->ld_errno;
-	}
-
 	if( mechanism == LDAP_SASL_SIMPLE ) {
 		if( dn == NULL && cred != NULL ) {
 			/* use default binddn */
@@ -97,7 +96,7 @@ ldap_sasl_bind(
 		return ld->ld_errno;
 	}
 
-	assert( BER_VALID( ber ) );
+	assert( LBER_VALID( ber ) );
 
 	if( mechanism == LDAP_SASL_SIMPLE ) {
 		/* simple bind */
@@ -106,7 +105,7 @@ ldap_sasl_bind(
 			ld->ld_version, dn, LDAP_AUTH_SIMPLE,
 			cred );
 		
-	} else if ( cred == NULL || !cred->bv_len ) {
+	} else if ( cred == NULL ) {
 		/* SASL bind w/o creditials */
 		rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/,
 			++ld->ld_msgid, LDAP_REQ_BIND,
@@ -169,7 +168,11 @@ ldap_sasl_bind_s(
 	LDAPMessage	*result;
 	struct berval	*scredp = NULL;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind_s\n", 0, 0, 0 );
+#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 ) {
@@ -186,6 +189,12 @@ ldap_sasl_bind_s(
 		return( rc );
 	}
 
+#ifdef LDAP_CONNECTIONLESS
+	if (LDAP_IS_UDP(ld)) {
+		return( rc );
+	}
+#endif
+
 	if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) {
 		return( ld->ld_errno );	/* ldap_result sets ld_errno */
 	}
@@ -245,16 +254,16 @@ ldap_parse_sasl_bind_result(
 	ber_tag_t tag;
 	BerElement	*ber;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
 	assert( res != NULL );
 
-	if ( ld == NULL || res == NULL ) {
-		return LDAP_PARAM_ERROR;
-	}
-
 	if( servercredp != NULL ) {
 		if( ld->ld_version < LDAP_VERSION2 ) {
 			return LDAP_NOT_SUPPORTED;
@@ -358,7 +367,11 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char
 	char **values, *mechlist;
 	int rc;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
+#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 );
@@ -423,7 +436,16 @@ ldap_sasl_interactive_bind_s(
 #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
 	ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );
 #endif
-
+#ifdef LDAP_CONNECTIONLESS
+	if( LDAP_IS_UDP(ld) ) {
+		/* Just force it to simple bind, silly to make the user
+		 * ask all the time. No, we don't ever actually bind, but I'll
+		 * let the final bind handler take care of saving the cdn.
+		 */
+		rc = ldap_simple_bind(ld, dn, NULL);
+		return rc < 0 ? rc : 0;
+	} else
+#endif
 	if( mechs == NULL || *mechs == '\0' ) {
 		char *smechs;
 
@@ -433,16 +455,27 @@ ldap_sasl_interactive_bind_s(
 			goto done;
 		}
 
+#ifdef NEW_LOGGING
+		LDAP_LOG ( TRANSPORT, DETAIL1, 
+			"ldap_interactive_sasl_bind_s: server supports: %s\n", 
+			smechs, 0, 0 );
+#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 ( TRANSPORT, DETAIL1, 
+			"ldap_interactive_sasl_bind_s: user selected: %s\n", mechs, 0, 0 );
+#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,