}
/* 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 */
#endif
/*
- * No email address for user? Make one up. (commented out because it appears to break things)
+ * No email address for user? Make one up. (Apparently this broke something in the past. What was it?)
+ */
if (IsEmptyStr(CC->user.emailaddrs)) {
sprintf(CC->user.emailaddrs, "cit%ld@%s", CC->user.usernum, CtdlGetConfigStr("c_fqdn"));
}
- */
-
/*
* Populate cs_inet_email and cs_inet_other_emails with valid email addresses from the user record