/*
* Set the EUID of the message to the UID of the vCard.
*/
- if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']);
+ if (msg->cm_fields['E'] != NULL)
+ {
+ free(msg->cm_fields['E']);
+ msg->cm_fields['E'] = NULL;
+ }
s = vcard_get_prop(v, "UID", 0, 0, 0);
if (s != NULL) {
msg->cm_fields['E'] = strdup(s);
/* Create and save the vCard */
v = vcard_new();
if (v == NULL) return;
- sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
- for (i=0; buf[i]; ++i) {
- if (buf[i] == ' ') buf[i] = '_';
- }
vcard_add_prop(v, "fn", usbuf->fullname);
vcard_add_prop(v, "n", vname);
vcard_add_prop(v, "adr", "adr:;;_;_;_;00000;__");
+
+#ifdef HAVE_GETPWUID_R
+ /* If using host auth mode, we add an email address based on the login */
+ if (config.c_auth_mode == AUTHMODE_HOST) {
+ struct passwd pwd;
+ struct passwd **result;
+ char pwd_buffer[SIZ];
+
+ if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, result) == 0) {
+ snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn);
+ vcard_add_prop(v, "email;internet", buf);
+ }
+ }
+#endif
+
+ /* Everyone gets an email address based on their display name */
+ snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, config.c_fqdn);
+ for (i=0; buf[i]; ++i) {
+ if (buf[i] == ' ') buf[i] = '_';
+ }
vcard_add_prop(v, "email;internet", buf);
+
+
vcard_write_user(usbuf, v);
vcard_free(v);
}