# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1278624456 0
# Node ID 22afdd5a9290c9554409805c1e77cf21c1187350
# Parent  c8cf189bf6db96f7e8fdf1428441a47c97643c82
jabber: Set js->serverFQDN when connecting via BOSH.  Fixes #12289

This fixes Cyrus not using DIGEST-MD5 seemingly inexplicably.

diff -r c8cf189bf6db -r 22afdd5a9290 ChangeLog
--- a/ChangeLog	Thu Jul 08 21:25:17 2010 +0000
+++ b/ChangeLog	Thu Jul 08 21:27:36 2010 +0000
@@ -29,6 +29,8 @@
 	  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
diff -r c8cf189bf6db -r 22afdd5a9290 libpurple/protocols/jabber/bosh.c
--- a/libpurple/protocols/jabber/bosh.c	Thu Jul 08 21:25:17 2010 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Thu Jul 08 21:27:36 2010 +0000
@@ -195,6 +195,11 @@
 	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");