Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh

diff --git a/uip/spost.c b/uip/spost.c
index 9b2ffcb..7a59d59 100644 (file)
--- 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);