Override SASL initial response if the server spoke first in its

continuation response. Closes: #2034.

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index a76677ff750125d7a71c1c3642e95f5f9c5b7fac..34a3bf1d9da923cc6f7c6f22677032f77ff28cea 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -150,7 +150,10 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA* idata, const char* method)
       }
     }
 
-    if (!client_start)
+    /* client-start is only available with the SASL-IR extension, but
+     * SASL 2.1 seems to want to use it regardless, at least for DIGEST
+     * fast reauth. Override if the server sent an initial continuation */
+    if (!client_start || buf[0])
     {
       do
       {