Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/auth_cyrus.c	Thu Jan 13 08:24:28 2011 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Mon Jan 17 22:37:03 2011 +0000
@@ -520,9 +520,12 @@
 		g_free(dec_in);
 
 		if (js->sasl_state != SASL_OK) {
-			/* This should never happen! */
+			/* This happens when the server sends back jibberish
+			 * in the "additional data with success" case.
+			 * Seen with Wildfire 3.0.1.
+			 */
 			*error = g_strdup(_("Invalid response from server"));
-			g_return_val_if_reached(JABBER_SASL_STATE_FAIL);
+			return JABBER_SASL_STATE_FAIL;
 		}
 	}