From 6d2eb0194d859fbc6a31ea2c5a8b4e1624070e0a Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@uncensored.citadel.org>
Date: Sat, 14 Feb 2015 17:14:43 -0500
Subject: [PATCH] fix to previous commit

---
 citadel/modules/xmpp/xmpp_query_namespace.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 795cd0e28..8482b4b81 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -79,7 +79,7 @@ void xmpp_iq_roster_query(void)
 	int nContexts, i;
 
 	syslog(LOG_DEBUG, "Roster push!");
-	cprintf("<query xmlns=\"jabber:iq:roster\">");
+	cprintf("<query xmlns=\"jabber:iq:roster\" rt=\"ass\">");
 	cptr = CtdlGetContextArray(&nContexts);
 	if (cptr) {
 		for (i=0; i<nContexts; i++) {
@@ -123,11 +123,26 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 	/*
 	 * Beginning of query result.
 	 */
+
+	char dom[1024];							// Pidgin is very picky about where this
+	safestrncpy(dom, XMPP->client_jid, sizeof(dom));		// result stanza is "from" - it wants the
+	if (IsEmptyStr(dom)) {						// same domain that the user's jid is in.
+		safestrncpy(dom, XMPP->server_name, sizeof(dom));
+	}
+	char *at = strrchr(dom, '@');
+	if (at) {
+		strcpy(dom, ++at);
+	}
+	char *slash = strchr(dom, '/');
+	if (slash) {
+		*slash = 0;
+	}
+
 	if (supported_namespace) {
-		cprintf("<iq type=\"result\" from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf) );
+		cprintf("<iq type=\"result\" from=\"%s\" ", xmlesc(xmlbuf, dom, sizeof xmlbuf) );
 	}
 	else {
-		cprintf("<iq type=\"error\" from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf) );
+		cprintf("<iq type=\"error\" from=\"%s\" ", xmlesc(xmlbuf, dom, sizeof xmlbuf) );
 	}
 	if (!IsEmptyStr(iq_from)) {
 		cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
-- 
2.30.2