X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=1b17b952f166ec0c5a3f544f08e033552ac73177;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hp=df7671798a280cbccf6f04756c08fb5845315ca0;hpb=2dea277848e779e7a923c9b4c8b98414d41abbda;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index df7671798..1b17b952f 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -45,7 +45,6 @@
 #include "support.h"
 #include "config.h"
 #include "internet_addressing.h"
-#include "md5.h"
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
@@ -58,10 +57,10 @@ void xmpp_roster_item(struct CitContext *cptr) {
 	char xmlbuf2[256];
 
 	cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
-		xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1),
+		xmlesc(xmlbuf1, cptr->cs_principal_id, sizeof xmlbuf1),
 		xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2)
 	);
-	cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
+	cprintf("<group>%s</group>", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1));
 	cprintf("</item>");
 }
 
@@ -78,13 +77,13 @@ void xmpp_iq_roster_query(void)
 	struct CitContext *cptr;
 	int nContexts, i;
 
-	syslog(LOG_DEBUG, "Roster push!");
+	syslog(LOG_DEBUG, "xmpp: roster push!");
 	cprintf("<query xmlns=\"jabber:iq:roster\">");
 	cptr = CtdlGetContextArray(&nContexts);
 	if (cptr) {
 		for (i=0; i<nContexts; i++) {
 			if (xmpp_is_visible(&cptr[i], CC)) {
-				XMPP_syslog(LOG_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
+				syslog(LOG_DEBUG, "xmpp: rosterizing %s", cptr[i].user.fullname);
 				xmpp_roster_item(&cptr[i]);
 			}
 		}
@@ -94,10 +93,8 @@ void xmpp_iq_roster_query(void)
 }
 
 
-
 /*
  * Client is doing a namespace query.  These are all handled differently.
- * A "rumplestiltskin lookup" is the most efficient way to handle this.  Please do not refactor this code.
  */
 void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns)
 {
@@ -119,7 +116,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 		supported_namespace = 1;
 	}
 
-	XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(id=%s, from=%s, to=%s, xmlns=%s)\n", iq_id, iq_from, iq_to, query_xmlns);
+	syslog(LOG_DEBUG, "xmpp: xmpp_query_namespace(id=%s, from=%s, to=%s, xmlns=%s)", iq_id, iq_from, iq_to, query_xmlns);
 
 	/*
 	 * Beginning of query result.
@@ -195,7 +192,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 	 */
 
 	else {
-		XMPP_syslog(LOG_DEBUG, "Unknown query namespace '%s' - returning <service-unavailable/>\n", query_xmlns);
+		syslog(LOG_DEBUG, "xmpp: unknown query namespace '%s' - returning <service-unavailable/>", query_xmlns);
 		cprintf("<error code=\"503\" type=\"cancel\">"
 			"<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
 			"</error>"