From 98bb940e0e5a38128465e834e9ee99f2e6060d93 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Fri, 21 Nov 2014 11:55:22 +0100 Subject: [PATCH] spost: If we add a From header, we add a qualified email address. Also clarified a comment and changed the description for blind distribution lists to the one that is most common today. --- uip/spost.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/uip/spost.c b/uip/spost.c index 9b2ffcb..7a59d59 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -430,7 +430,7 @@ finish_headers(FILE *out) fprintf(out, "%sDate: %s\n", resentstr, dtimenow()); } - strncpy(from, getusername(), sizeof(from)); + snprintf(from, sizeof(from), "%s@%s", getusername(), LocalName()); if ((cp = getfullname()) && *cp) { snprintf(signature, sizeof(signature), "%s <%s>", cp, from); } else { @@ -439,11 +439,14 @@ finish_headers(FILE *out) if (!(msgflags & MFRM)) { fprintf(out, "%sFrom: %s\n", resentstr, signature); } else { - /* In case the From: header contains multiple addresses. */ + /* + ** Add a Sender: header because the From: header could + ** be fake or contain multiple addresses. + */ fprintf(out, "%sSender: %s\n", resentstr, from); } if (!(msgflags & MVIS)) { - fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr); + fprintf(out, "%sBcc: undisclosed-recipients:;\n", resentstr); } if (badmsg) { unlink(tmpfil); -- 1.7.10.4