Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/auth_cyrus.c @ 31648:fa88dc1dcabb
merged from im.pidgin.pidgin
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 12 Feb 2011 04:17:09 +0900 |
parents | 84e9eb0ae4d5 |
children | b1a6535f99d9 |
comparison
equal
deleted
inserted
replaced
31508:c92bc01056ea | 31648:fa88dc1dcabb |
---|---|
518 | 518 |
519 g_free(enc_in); | 519 g_free(enc_in); |
520 g_free(dec_in); | 520 g_free(dec_in); |
521 | 521 |
522 if (js->sasl_state != SASL_OK) { | 522 if (js->sasl_state != SASL_OK) { |
523 /* This should never happen! */ | 523 /* This happens when the server sends back jibberish |
524 * in the "additional data with success" case. | |
525 * Seen with Wildfire 3.0.1. | |
526 */ | |
524 *error = g_strdup(_("Invalid response from server")); | 527 *error = g_strdup(_("Invalid response from server")); |
525 g_return_val_if_reached(JABBER_SASL_STATE_FAIL); | 528 return JABBER_SASL_STATE_FAIL; |
526 } | 529 } |
527 } | 530 } |
528 | 531 |
529 /* If we've negotiated a security layer, we need to enable it */ | 532 /* If we've negotiated a security layer, we need to enable it */ |
530 if (js->sasl) { | 533 if (js->sasl) { |