Mercurial > pidgin
changeset 31149:4c4482625191
merge of '0d389b1a3f186fbbea57629066032e0fe9b7a47d'
and '3e1e394a5c30d86e26a1419fbfbc1af5d31dff09'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 17 Jan 2011 22:37:30 +0000 |
| parents | 84e9eb0ae4d5 (diff) 28b328da7269 (current diff) |
| children | 19e89f916e69 |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth_cyrus.c Mon Jan 17 20:21:22 2011 +0000 +++ b/libpurple/protocols/jabber/auth_cyrus.c Mon Jan 17 22:37:30 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; } }