diff libpurple/protocols/jabber/auth_cyrus.c @ 30997:3f5ff1ea4802

jabber: Partial revert (everything but ChangeLog) of 945ef5abc5 It causes issues with non-GAfyD accounts associated with arbitrary email addresses (since Google lets the user auth with that email and then changes the JID to be "@gmail.com"). Fixes #a14153
author Paul Aurich <paul@darkrain42.org>
date Mon, 20 Sep 2010 00:51:21 +0000
parents a5131a257967
children 84e9eb0ae4d5
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth_cyrus.c	Sat Sep 18 22:27:49 2010 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Mon Sep 20 00:51:21 2010 +0000
@@ -321,11 +321,8 @@
 		xmlnode_set_namespace(auth, NS_XMPP_SASL);
 		xmlnode_set_attrib(auth, "mechanism", js->current_mech);
 
-		if (g_str_equal(js->user->domain, "gmail.com") ||
-				g_str_equal(js->user->domain, "googlemail.com")) {
-			xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
-			xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
-		}
+		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
+		xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
 
 		if (clientout) {
 			if (coutlen == 0) {