X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=84aa4ba38bbdafee127706d2b3beead9c8443102;hp=c2d498ba4580d1c4aa0abdae979582e82c9aa325;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hpb=93f719e3132da1eb448f7ca27c852fbe0953a63c

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index c2d498ba4..84aa4ba38 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -420,7 +420,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 			}
 
 			/* Generate the "full JID" of the client (user@host/resource) */
-			snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_inet_email, XMPP->iq_client_resource);
+			snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_principal_id, XMPP->iq_client_resource);
 
 			/* Tell the client what its JID is */
 			cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
@@ -649,7 +649,7 @@ void xmpp_async_loop(void) {
  * Login hook for XMPP sessions
  */
 void xmpp_login_hook(void) {
-	xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_inet_email);
+	xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_principal_id);
 }
 
 
@@ -657,7 +657,7 @@ void xmpp_login_hook(void) {
  * Logout hook for XMPP sessions
  */
 void xmpp_logout_hook(void) {
-	xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_inet_email);
+	xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_principal_id);
 }