xmpp_non_sasl_authenticate(
XMPP->iq_id,
XMPP->iq_client_username,
- XMPP->iq_client_password,
- XMPP->iq_client_resource
+ XMPP->iq_client_password
);
}
/* 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 */