pidgin: 0673f857: jabber: Fix the GSSAPI-not-attempted fal...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 0673f8579282f4181ac7fb5738a1afc873b57cac
Ancestor: 06fcbcb8d044bcd6887415dc87274071bb724596
Author: darkrain42 at pidgin.im
Date: 2010-06-12T18:22:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0673f8579282f4181ac7fb5738a1afc873b57cac

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

ChangeLog: 

jabber: Fix the GSSAPI-not-attempted fallback.  Refs #12031

The mech string ends with a ' ', so this wasn't matching.

-------------- next part --------------
============================================================
--- ChangeLog	b726d30ee39ac1ef0a53d572ef8eaad04538f8a8
+++ ChangeLog	be8ee4ae8437b441401513586a8cdd97d457d075
@@ -11,6 +11,10 @@ version 2.7.2 (??/??/????):
 	* Rebindable suggest-next-page and suggest-prev-page actions for
 	  textboxes (GntEntry) to scroll through list of suggestions.
 
+	XMPP:
+	* Allow connecting to servers that only advertise GSSAPI and expect
+	  a fallback to legacy IQ authentication (broken in 2.7.0).
+
 version 2.7.1 (05/29/2010):
 	General:
 	* Build fixes on OpenSolaris.  (Brian Lu)
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	4f2b22d5544a49be18e0f71ac97b67fcc5fec23d
+++ libpurple/protocols/jabber/auth_cyrus.c	0133869a6af054953573bb36fcb09742d79083ac
@@ -256,7 +256,7 @@ jabber_auth_start_cyrus(JabberStream *js
 					js->auth_fail_count++;
 
 				if (js->auth_fail_count == 1 &&
-					(js->sasl_mechs->str && g_str_equal(js->sasl_mechs->str, "GSSAPI"))) {
+					(js->sasl_mechs->str && g_str_equal(js->sasl_mechs->str, "GSSAPI "))) {
 					/* If we tried GSSAPI first, it failed, and it was the only method we had to try, try jabber:iq:auth
 					 * for compatibility with iChat 10.5 Server and other jabberd based servers.
 					 *