Fix SASL automatic/quiet modes...

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 3349fc994217fe0f76a2d9c75f9b06fc851b55d3..aa1c677b580eb34c680f1052c1fa8067907b7831 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -600,12 +600,12 @@ ldap_int_sasl_bind(
 
        if( flags != LDAP_SASL_QUIET ) {
                saslrc = sasl_getprop( ctx, SASL_USERNAME, (void **) &data );
-               if( saslrc == SASL_OK ) {
+               if( saslrc == SASL_OK && data && *data ) {
                        fprintf( stderr, "SASL username: %s\n", data );
                }
 
                saslrc = sasl_getprop( ctx, SASL_REALM, (void **) &data );
-               if( saslrc == SASL_OK ) {
+               if( saslrc == SASL_OK && data && *data ) {
                        fprintf( stderr, "SASL realm: %s\n", data );
                }
        }

diff --git a/libraries/liblutil/sasl.c b/libraries/liblutil/sasl.c
index 743758f815e86efe6d7f4244771ebd6bc90fa7a1..1a09e655eb025269201347f31dec81337b3fbab7 100644 (file)
--- a/libraries/liblutil/sasl.c
+++ b/libraries/liblutil/sasl.c
@@ -101,7 +101,9 @@ static int interaction(
 
        if( dflt && !*dflt ) dflt = NULL;
 
-       if( flags != LDAP_SASL_INTERACTIVE && dflt ) {
+       if( flags != LDAP_SASL_INTERACTIVE &&
+               ( dflt || interact->id == SASL_CB_USER ) )
+       {
                goto use_default;
        }
 
@@ -184,7 +186,7 @@ int lutil_sasl_interact(
 {
        sasl_interact_t *interact = in;
 
-       if( flags != LDAP_SASL_QUIET ) {
+       if( flags == LDAP_SASL_INTERACTIVE ) {
                fputs( "SASL Interaction\n", stderr );
        }