changeset 30603:e727f4f0ae02

jabber: Fix the GSSAPI-not-attempted fallback. Refs #12031 The mech string ends with a ' ', so this wasn't matching.
author Paul Aurich <paul@darkrain42.org>
date Sat, 12 Jun 2010 18:22:46 +0000
parents 27aff21c5eea
children e9d540664ea3
files ChangeLog libpurple/protocols/jabber/auth_cyrus.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jun 12 02:41:35 2010 +0000
+++ b/ChangeLog	Sat Jun 12 18:22:46 2010 +0000
@@ -11,6 +11,10 @@
 	* 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)
--- a/libpurple/protocols/jabber/auth_cyrus.c	Sat Jun 12 02:41:35 2010 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Sat Jun 12 18:22:46 2010 +0000
@@ -256,7 +256,7 @@
 					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.
 					 *