pidgin: 50f72cec: jabber: Set js->serverFQDN when connecti...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 50f72cecab1bd2bb5de26966b3c15dc3a32f75ca
Parent:   d63a5c469df95420fc1e1b38df6be9c75ba25d40
Author:   darkrain42 at pidgin.im
Date:     07/08/10 17:27:36
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/50f72cecab1bd2bb5de26966b3c15dc3a32f75ca

Changelog: 

jabber: Set js->serverFQDN when connecting via BOSH.  Fixes #12289

This fixes Cyrus not using DIGEST-MD5 seemingly inexplicably.

Changes against parent d63a5c469df95420fc1e1b38df6be9c75ba25d40

  patched  ChangeLog
  patched  libpurple/protocols/jabber/bosh.c

-------------- next part --------------
============================================================
--- ChangeLog	a70753df6a48429151cf1ef7f4863d502baccfe3
+++ ChangeLog	70cf633887f54b46004bc8528e0c07271814b3a9
@@ -29,6 +29,8 @@ version 2.7.2 (??/??/????):
 	  the specification.
 	* When initiating a file transfer, don't show resources that are certain
 	  to not support file transfers in the resource selection dialog.
+	* Fix connecting to servers using BOSH and authenticating with
+	  DIGEST-MD5 when libpurple was built with Cyrus SASL support.
 
 	Yahoo/Yahoo JAPAN:
 	* Renamed "Use account proxy for SSL connections" to "Use account proxy
============================================================
--- libpurple/protocols/jabber/bosh.c	d9e943224049cf19d50cf0b9eec4d8c6d8011133
+++ libpurple/protocols/jabber/bosh.c	9be4bd5785e2bc92d35f1fbe83149679332abce5
@@ -195,6 +195,11 @@ jabber_bosh_connection_init(JabberStream
 	g_free(path);
 	conn->pipelining = TRUE;
 
+	if (purple_ip_address_is_valid(host))
+		js->serverFQDN = g_strdup(js->user->domain);
+	else
+		js->serverFQDN = g_strdup(host);
+
 	if ((user && user[0] != '\0') || (passwd && passwd[0] != '\0')) {
 		purple_debug_info("jabber", "Ignoring unexpected username and password "
 		                            "in BOSH URL.\n");