projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The user principal identity is now used as the JID in all XMPP protocol stanzas.
[citadel.git]
/
citadel
/
modules
/
xmpp
/
serv_xmpp.c
diff --git
a/citadel/modules/xmpp/serv_xmpp.c
b/citadel/modules/xmpp/serv_xmpp.c
index c2d498ba4580d1c4aa0abdae979582e82c9aa325..84aa4ba38bbdafee127706d2b3beead9c8443102 100644
(file)
--- 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) */
}
/* 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));
/* 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) {
* 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) {
* 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
);
}
}