X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=48f97978dbd3319f66df156cd91c494a0687c2d4;hp=de4a6d2863b56f0cef27d52dc3648212f4bffab4;hb=eda302e1f049eae6b429a12c5526600eea6a02e1;hpb=ca0b3e830b86700d9e5e31b1784de2bdcaf58fc5 diff --git a/uip/spost.c b/uip/spost.c index de4a6d2..48f9797 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -16,6 +16,9 @@ #include #include #include +#include +#include +#include #define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */ @@ -53,6 +56,7 @@ static struct swit switches[] = { #define MVIS 0x0008 /* we've seen sighted addrs */ #define MINV 0x0010 /* we've seen blind addrs */ #define MRDT 0x0020 /* we've seen a Resent-Date: */ +#define MFMM 0x0040 /* The Mail is From a Alternative-Mailbox Addresse */ struct headers { char *value; @@ -149,19 +153,19 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [switches] file", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case DEBUGSW: debug++; @@ -180,16 +184,16 @@ main(int argc, char **argv) } } if (msg) - adios(NULL, "only one message at a time!"); + adios(EX_USAGE, NULL, "only one message at a time!"); else msg = cp; } if (!msg) - adios(NULL, "usage: %s [switches] file", invo_name); + adios(EX_USAGE, NULL, "usage: %s [switches] file", invo_name); if ((in = fopen(msg, "r")) == NULL) - adios(msg, "unable to open"); + adios(EX_IOERR, msg, "unable to open"); if (debug) { verbose++; @@ -206,7 +210,7 @@ main(int argc, char **argv) for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) { if ((state = alias(etcpath(*ap))) != AK_OK) { - adios(NULL, "aliasing error in file %s: %s", + adios(EX_IOERR, NULL, "aliasing error in file %s: %s", *ap, akerror(state)); } } @@ -250,11 +254,11 @@ main(int argc, char **argv) case LENERR: case FMTERR: - adios(NULL, "message format error in component #%d", + adios(EX_DATAERR, NULL, "message format error in component #%d", compnum); default: - adios(NULL, "getfld() returned %d", state); + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } break; } @@ -262,7 +266,7 @@ main(int argc, char **argv) if (debug) { /* stop here */ - done(0); + exit(EX_OK); } fclose(out); @@ -277,7 +281,7 @@ main(int argc, char **argv) if (!(msgflags & MVIS)) { /* only Bcc rcpts: we're finished here */ unlink(tmpfil); - exit(0); + exit(EX_OK); } } @@ -286,7 +290,7 @@ main(int argc, char **argv) ** the msg temp file as std in. */ if (!freopen(tmpfil, "r", stdin)) { - adios(tmpfil, "can't reopen for sendmail"); + adios(EX_IOERR, tmpfil, "can't reopen for sendmail"); } unlink(tmpfil); @@ -300,7 +304,7 @@ main(int argc, char **argv) } *argp = NULL; execv(sendmail, sargv); - adios(sendmail, "can't exec"); + adios(EX_OSERR, sendmail, "can't exec"); return -1; } @@ -314,20 +318,25 @@ putfmt(char *name, char *str, FILE *out) char *cp; struct headers *hdr; - /* remove all leading whitespace (even newlines) */ - while (*str==' ' || *str=='\t' || *str=='\n') { + /* remove leading whitespace */ + while (*str==' ' || *str=='\t') { str++; } if ((i = get_header(name, hdrtab)) == NOTOK) { - /* no header we would care for: push it through */ - fprintf(out, "%s: %s", name, str); + /* no header we would care for */ + if (mh_strcasecmp(name, attach_hdr)!=0 && + mh_strcasecmp(name, sign_hdr)!=0 && + mh_strcasecmp(name, enc_hdr)!=0) { + /* push it through */ + fprintf(out, "%s: %s", name, str); + } return; } /* it's one of the interesting headers */ hdr = &hdrtab[i]; - if (hdr->flags & HIGN || !*str) { + if (hdr->flags & HIGN || strcmp(str, "\n")==0) { return; } @@ -403,6 +412,21 @@ putfmt(char *name, char *str, FILE *out) ** -- meillo@marmaro.de 2012-02 */ + if (hdr->set & MFRM) { + + struct mailname *mp = NULL; + + /* This is need because the addresse parser hold global state */ + ismymbox(NULL); + + while ((cp = getname(str)) != NULL) { + mp = getm(cp, NULL, 0, AD_NAME, NULL); + if (ismymbox(mp)) { + msgflags |= MFMM; + } + } + } + if (hdr->flags & HSUB) { subject = getcpy(str); } @@ -425,24 +449,33 @@ finish_headers(FILE *out) fprintf(out, "%sDate: %s\n", resentstr, dtimenow()); } - strncpy(from, getusername(), sizeof(from)); - if ((cp = getfullname()) && *cp) { - snprintf(signature, sizeof(signature), "%s <%s>", cp, from); + if ((cp = context_find("Default-From")) != NULL) { + snprintf(signature, sizeof(signature), "%s", cp); } else { - snprintf(signature, sizeof(signature), "%s", from); + snprintf(from, sizeof(from), "%s@%s", getusername(), LocalName()); + if ((cp = getfullname()) && *cp) { + snprintf(signature, sizeof(signature), "%s <%s>", cp, from); + } else { + snprintf(signature, sizeof(signature), "%s", from); + } } if (!(msgflags & MFRM)) { fprintf(out, "%sFrom: %s\n", resentstr, signature); } else { - /* In case the From: header contains multiple addresses. */ - fprintf(out, "%sSender: %s\n", resentstr, from); + /* + ** Add a Sender: header because the From: header could + ** be fake or contain multiple addresses. + */ + if (!(msgflags & MFMM)) { + fprintf(out, "%sSender: %s\n", resentstr, signature); + } } if (!(msgflags & MVIS)) { - fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr); + fprintf(out, "%sBcc: undisclosed-recipients:;\n", resentstr); } if (badmsg) { unlink(tmpfil); - adios(NULL, "re-format message and try again"); + adios(EX_DATAERR, NULL, "re-format message and try again"); } } @@ -555,7 +588,7 @@ process_fcc(char *str) int state = 0; if (strlen(str)+strlen(fccs) > sizeof fccs /2) { - adios(NULL, "Too much Fcc data"); + adios(EX_DATAERR, NULL, "Too much Fcc data"); } /* todo: better have three states: SEPARATOR, PLUS, WORD */ for (cp=pp=str; *cp; cp++) { @@ -598,7 +631,7 @@ fcc(char *file, char *folders) fflush(stdout); } if (100+strlen(file)+strlen(folders) > sizeof cmd) { - adios(NULL, "Too much Fcc data"); + adios(EX_DATAERR, NULL, "Too much Fcc data"); } /* hack: read from /dev/null and refile(1) won't question us */ snprintf(cmd, sizeof cmd, "m_text); unlink(bccdraft);