ITS#884: GSSAPI interoperabity with ActiveDirectory

Improve interoperability when of scred is present but empty.

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 3b35dd2fbedeead8de5fa82c2690054afde121d7..e6026872a371a1e183937229d9833e57cf36e99d 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -564,7 +564,7 @@ ldap_int_sasl_bind(
                }
 
                if ( rc != LDAP_SUCCESS && rc != LDAP_SASL_BIND_IN_PROGRESS ) {
-                       if( scred ) {
+                       if( scred && scred->bv_len ) {
                                /* and server provided us with data? */
                                Debug( LDAP_DEBUG_TRACE,
                                        "ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
@@ -576,7 +576,7 @@ ldap_int_sasl_bind(
 
                if( rc == LDAP_SUCCESS && saslrc == SASL_OK ) {
                        /* we're done, no need to step */
-                       if( scred ) {
+                       if( scred && scred->bv_len ) {
                                /* but server provided us with data! */
                                Debug( LDAP_DEBUG_TRACE,
                                        "ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",