X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=7e42db01a3af37a1b0855338adf22f3663c259f0;hb=91b0bcd852c106bb1221b6f605603815e21cbdeb;hp=e0b61af64413e38b7978d4b42d0f5388cd2ef71a;hpb=df8fe1be788cd4193b9e213009b665b47f1ed385;p=citadel.git diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index e0b61af64..7e42db01a 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -409,21 +409,11 @@ void xmpp_xml_end(void *data, const char *supplied_el) { /* If the client has not specified a client resource, generate one */ if (IsEmptyStr(XMPP->iq_client_resource)) { - generate_uuid(XMPP->iq_client_resource); + snprintf(XMPP->iq_client_resource, sizeof XMPP->iq_client_resource, "%d", CC->cs_pid); } /* Generate the "full JID" of the client resource */ - - if (IsEmptyStr(CC->cs_inet_email)) { // synthetic user@host if no email is set - snprintf(XMPP->client_jid, sizeof XMPP->client_jid, - "%ld@%s/%s", CC->user.usernum, CtdlGetConfigStr("c_fqdn"), XMPP->iq_client_resource - ); - } - else { // use the email address if we have it - 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_inet_email, XMPP->iq_client_resource); /* Tell the client what its JID is */