pidgin: 5f410e72: jabber: Pluck evands's 2fcd83432 (the pa...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5f410e729e7a8a2e46752d46b37a7c11e17d5ed7
Ancestor: 82175cfc320b7c831512ecc2a00beec2a86b7a2a
Author: darkrain42 at pidgin.im
Date: 2010-05-04T01:57:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5f410e729e7a8a2e46752d46b37a7c11e17d5ed7

Modified files:
        libpurple/protocols/jabber/auth_cyrus.c

ChangeLog: 

jabber: Pluck evands's 2fcd83432 (the part that applies) to i.p.p

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	ea44881795aca9d4a6d2926935a069f284278479
+++ libpurple/protocols/jabber/auth_cyrus.c	0baec9cfbd26ca22a7fb667ec68a1804e087770c
@@ -252,24 +252,9 @@ jabber_auth_start_cyrus(JabberStream *js
 					g_free(msg);
 					return JABBER_SASL_STATE_CONTINUE;
 
-				} else {
-					/* We have no mechs which can work.
-					 * Try falling back on the old jabber:iq:auth method. We get here if the server supports
-					 * one or more sasl mechs, we are compiled with cyrus-sasl support, but we support or can connect with none of
-					 * the offerred mechs. jabberd 2.0 w/ SASL and Apple's iChat Server 10.5 both handle and expect
-					 * jabber:iq:auth in this situation.  iChat Server in particular offers SASL GSSAPI by default, which is often
-					 * not configured on the client side, and expects a fallback to jabber:iq:auth when it (predictably) fails.
-					 *
-					 * Note: xep-0078 points out that using jabber:iq:auth after a sasl failure is wrong. However,
-					 * I believe this refers to actual authentication failure, not a simple lack of concordant mechanisms.
-					 * Doing otherwise means that simply compiling with SASL support renders the client unable to connect to servers
-					 * which would connect without issue otherwise. -evands
-					 */
-					js->auth_mech = NULL;
-					jabber_auth_start_old(js);
-					return JABBER_SASL_STATE_CONTINUE;
 				}
-				/* not reached */
+
+				/* We found no mechs which could work */
 				break;
 
 				/* Fatal errors. Give up and go home */