From eb4fda4ecda7d5f6a9ea367a84586942adb1b743 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Tue, 20 Jan 2009 16:15:52 +0000 Subject: [PATCH] Added "<>" around email address for "MAIL FROM:" SVN revision: 2161 --- src/elogd.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 37a8beac..f0d2de40 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -3443,20 +3443,32 @@ void retrieve_email_from(LOGBOOK * lbs, char *ret, char *ret_name, char attrib[M int i; if (getcfg(lbs->name, "Use Email from", str, sizeof(str))) { - strlcpy(email_from, str, sizeof(email_from)); + if (str[0] != '<') { + strlcpy(email_from, "<", sizeof(email_from)); + strlcat(email_from, str, sizeof(email_from)); + strlcat(email_from, ">", sizeof(email_from)); + } else + strlcpy(email_from, str, sizeof(email_from)); strlcpy(email_from_name, str, sizeof(email_from)); } else if (isparam("full_name") && isparam("user_email")) { strlcpy(email_from_name, getparam("full_name"), sizeof(email_from_name)); strlcat(email_from_name, " <", sizeof(email_from_name)); strlcat(email_from_name, getparam("user_email"), sizeof(email_from_name)); strlcat(email_from_name, ">", sizeof(email_from_name)); - strlcpy(email_from, getparam("user_email"), sizeof(email_from)); + strlcpy(email_from, "<", sizeof(email_from)); + strlcat(email_from, getparam("user_email"), sizeof(email_from)); + strlcat(email_from, ">", sizeof(email_from)); } else if (getcfg(lbs->name, "Default Email from", str, sizeof(str))) { - strlcpy(email_from, str, sizeof(email_from)); + if (str[0] != '<') { + strlcpy(email_from, "<", sizeof(email_from)); + strlcat(email_from, str, sizeof(email_from)); + strlcat(email_from, ">", sizeof(email_from)); + } else + strlcpy(email_from, str, sizeof(email_from)); strlcpy(email_from_name, str, sizeof(email_from)); } else { sprintf(email_from_name, "ELog ", host_name); - sprintf(email_from, "ELog@%s", host_name); + sprintf(email_from, "", host_name); } if (attrib) {