X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=8b4b8300dacc80edce7eae329d2d661d24c7fec5;hp=73787f79ca8adbad53306da10816973e6b6b551e;hb=fcde9624e6832e0dcdc6f21996b69b7e58745e3d;hpb=5276fe8873c9201f9b4ba8c6fcb5efb3887eab77 diff --git a/uip/spost.c b/uip/spost.c index 73787f7..8b4b830 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -15,54 +15,37 @@ #include #include #include -#include #include #define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */ #define FCCS 10 /* max number of fccs allowed */ struct swit switches[] = { -#define FILTSW 0 - { "filter filterfile", 0 }, -#define NFILTSW 1 - { "nofilter", 0 }, -#define FRMTSW 2 - { "format", 0 }, -#define NFRMTSW 3 - { "noformat", 0 }, -#define REMVSW 4 - { "remove", 0 }, -#define NREMVSW 5 - { "noremove", 0 }, -#define VERBSW 6 +#define VERBSW 0 { "verbose", 0 }, -#define NVERBSW 7 +#define NVERBSW 1 { "noverbose", 0 }, -#define WATCSW 8 +#define WATCSW 2 { "watch", 0 }, -#define NWATCSW 9 +#define NWATCSW 3 { "nowatch", 0 }, -#define BACKSW 10 - { "backup", 0 }, -#define NBACKSW 11 - { "nobackup", 0 }, -#define ALIASW 12 +#define ALIASW 4 { "alias aliasfile", 0 }, -#define NALIASW 13 +#define NALIASW 5 { "noalias", 0 }, -#define VERSIONSW 14 +#define VERSIONSW 6 { "version", 0 }, -#define HELPSW 15 +#define HELPSW 7 { "help", 0 }, -#define DEBUGSW 16 +#define DEBUGSW 8 { "debug", -5 }, -#define DISTSW 17 +#define DISTSW 9 { "dist", -4 }, /* interface from dist */ -#define PUSHSW 18 /* fork to sendmail then exit */ +#define PUSHSW 10 /* fork to sendmail then exit */ { "push", -4 }, -#define NPUSHSW 19 /* exec sendmail */ +#define NPUSHSW 11 /* exec sendmail */ { "nopush", -6 }, -#define LIBSW 20 +#define LIBSW 12 { "library directory", -7 }, { NULL, 0 } }; @@ -75,11 +58,10 @@ struct swit switches[] = { #define HSUB 0x0004 /* Subject: header */ #define HTRY 0x0008 /* try to send to addrs on header */ #define HBCC 0x0010 /* don't output this header */ -#define HMNG 0x0020 /* mung this header */ -#define HNGR 0x0040 /* no groups allowed in this header */ -#define HFCC 0x0080 /* FCC: type header */ -#define HNIL 0x0100 /* okay for this header not to have addrs */ -#define HIGN 0x0200 /* ignore this header */ +#define HNGR 0x0020 /* no groups allowed in this header */ +#define HFCC 0x0040 /* FCC: type header */ +#define HNIL 0x0080 /* okay for this header not to have addrs */ +#define HIGN 0x0100 /* ignore this header */ /* flags for headers->set */ #define MFRM 0x0001 /* we've seen a From: */ @@ -132,9 +114,7 @@ static struct headers RHeaders[] = { static int badmsg = 0; /* message has bad semantics */ static int verbose = 0; /* spell it out */ static int debug = 0; /* debugging post */ -static int rmflg = 1; /* remove temporary file when done */ static int watch = 0; /* watch the delivery process */ -static int backflg = 0; /* rename input file as *.bak when done */ static int pushflg = 0; /* if going to fork to sendmail */ static int aliasflg = 0; /* if going to process aliases */ @@ -144,14 +124,13 @@ static enum { normal, resent } msgstate = normal; -static char tmpfil[] = "/tmp/pstXXXXXX"; +static char tmpfil[] = "/tmp/spost-XXXXXX"; +static char bccfil[] = "/tmp/spost-bcc-XXXXXX"; -static char from[BUFSIZ]; /* my network address */ -static char signature[BUFSIZ]; /* my signature */ -static char *filter = NULL; /* the filter for BCC'ing */ static char *subject = NULL; /* the subject field for BCC'ing */ static char *fccfold[FCCS]; /* foldernames for FCC'ing */ static short fccind = 0; /* index into fccfold[] */ +struct mailname *bccs = NULL; static struct headers *hdrtab; /* table for the message we're doing */ static FILE *out; /* output (temp) file */ @@ -159,28 +138,16 @@ static FILE *out; /* output (temp) file */ extern char *sendmail; /* -** external prototypes -*/ -extern char *getfullname(void); -extern char *getusername(void); - -extern boolean draft_from_masquerading; /* defined in mts.c */ - -/* ** static prototypes */ static void putfmt(char *, char *, FILE *); -static void start_headers(void); static void finish_headers(FILE *); static int get_header(char *, struct headers *); static void putadr(char *, struct mailname *); static int putone(char *, int, int); static void insert_fcc(char *, unsigned char *); static void fcc(char *, char *); - -#if 0 -static void make_bcc_file(void); -#endif +static void make_bcc_draft(char *); int @@ -200,7 +167,6 @@ main(int argc, char **argv) if (context_foil(NULL) == -1) done(1); - mts_init(invo_name); arguments = getarguments(invo_name, argc, argv, 0); argp = arguments; @@ -231,29 +197,6 @@ main(int argc, char **argv) msgstate = resent; continue; - case FILTSW: - if (!(filter = *argp++) || *filter == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - continue; - case NFILTSW: - filter = NULL; - continue; - - case REMVSW: - rmflg++; - continue; - case NREMVSW: - rmflg = 0; - continue; - - case BACKSW: - backflg++; - continue; - case NBACKSW: - backflg = 0; - continue; - case VERBSW: verbose++; continue; @@ -281,7 +224,7 @@ main(int argc, char **argv) argp[-2]); aliasflg = 1; if ((state = alias(cp)) != AK_OK) - adios(NULL, "aliasing error in file %s - %s", cp, akerror(state) ); + adios(NULL, "aliasing error in file %s - %s", cp, akerror(state)); continue; case NALIASW: aliasflg = 0; @@ -309,22 +252,20 @@ main(int argc, char **argv) if ((in = fopen(msg, "r")) == NULL) adios(msg, "unable to open"); - start_headers(); if (debug) { verbose++; out = stdout; - } - else { + } else { #ifdef HAVE_MKSTEMP - if ((out = fdopen( mkstemp(tmpfil), "w" )) == NULL ) - adios(tmpfil, "unable to create"); + if ((out = fdopen(mkstemp(tmpfil), "w")) == NULL) + adios(tmpfil, "unable to create"); #else - mktemp(tmpfil); - if ((out = fopen(tmpfil, "w")) == NULL) - adios(tmpfil, "unable to create"); - chmod(tmpfil, 0600); + mktemp(tmpfil); + if ((out = fopen(tmpfil, "w")) == NULL) + adios(tmpfil, "unable to create"); + chmod(tmpfil, 0600); #endif - } + } hdrtab = (msgstate == normal) ? NHeaders : RHeaders; @@ -371,44 +312,46 @@ main(int argc, char **argv) } break; } - fclose(in); - if (backflg) { - strncpy(buf, m_backup(msg), sizeof(buf)); - if (rename(msg, buf) == NOTOK) - advise(buf, "unable to rename %s to", msg); - } if (debug) { + /* stop here */ done(0); - } else { - fclose(out); } + fclose(out); + /* process Fcc */ for (i=0; iflags & HIGN) { return; } @@ -462,7 +424,7 @@ putfmt(char *name, char *str, FILE *out) if (hdr->flags & HSUB) { if (subject) { - /* append mupliple subject */ + /* concatenate mupliple subject */ char *cp = concat(subject, "\t", str, NULL); free(subject); subject = cp; @@ -483,15 +445,17 @@ putfmt(char *name, char *str, FILE *out) return; } -#ifdef notdef - if (hdr->flags & HBCC) { - insert_bcc(str); - return; - } -#endif /* notdef */ - if (*str != '\n' && *str != '\0') { - if (aliasflg && hdr->flags & HTRY) { + if (hdr->flags & HBCC) { + struct mailname *mp = NULL; + + /* Create list of Bcc adds. */ + while ((cp = getname(str))) { + mp = getm(cp, NULL, 0, AD_HOST, NULL); + mp->m_next = bccs; /* push */ + bccs = mp; + } + } else if (aliasflg && hdr->flags & HTRY) { /* ** this header contains address(es) that we have to do ** alias expansion on. Because of the saved state in @@ -535,19 +499,26 @@ putfmt(char *name, char *str, FILE *out) ** alias processing as well. ** -- Dan Harkless */ - fprintf(out, "%s: %s", name, str ); + fprintf(out, "%s: %s", name, str); } } } /* -** Construct signature name +** Add yet missing headers. */ static void -start_headers(void) +finish_headers(FILE *out) { char *cp; + char from[BUFSIZ]; /* my network address */ + char signature[BUFSIZ]; /* my signature */ + char *resentstr = (msgstate == resent) ? "Resent-" : ""; + + if (!(msgflags & MDAT)) { + fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0)); + } strncpy(from, getusername(), sizeof(from)); if ((cp = getfullname()) && *cp) { @@ -555,36 +526,15 @@ start_headers(void) } else { snprintf(signature, sizeof(signature), "%s", from); } -} - - -/* -** Add yet missing headers. -*/ -static void -finish_headers(FILE *out) -{ - char *resentstr = (msgstate == resent) ? "Resent-" : ""; - - if (!(msgflags & MDAT)) { - fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0)); - } if (!(msgflags & MFRM)) { fprintf(out, "%sFrom: %s\n", resentstr, signature); - } else if (!draft_from_masquerading) { - /* - ** mts.conf didn't contain "masquerade:[...]draft_from[...]" - ** so we'll reveal the user's actual account@thismachine - ** address in a Sender: header (and use it as the envelope - ** From: later). - */ + } else { + /* In case the From: header contains multiple addresses. */ fprintf(out, "%sSender: %s\n", resentstr, from); } -#ifdef notdef - if (!(msgflags & MVIS)) + if (!(msgflags & MVIS)) { fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr); -#endif /* notdef */ - + } if (badmsg) { adios(NULL, "re-format message and try again"); } @@ -617,9 +567,9 @@ get_header(char *header, struct headers *table) static void putadr(char *name, struct mailname *nl) { - register struct mailname *mp, *mp2; - register int linepos; - register char *cp; + struct mailname *mp, *mp2; + int linepos; + char *cp; int namelen; fprintf(out, "%s: ", name); @@ -634,34 +584,37 @@ putadr(char *name, struct mailname *nl) if (mp->m_nohost) { /* a local name - see if it's an alias */ cp = akvalue(mp->m_mbox); - if (cp == mp->m_mbox) + if (cp == mp->m_mbox) { /* wasn't an alias - use what the user typed */ linepos = putone(mp->m_text, linepos, namelen); - else + } else { /* an alias - expand it */ while ((cp = getname(cp))) { if (linepos > MAX_SM_FIELD) { - fprintf(out, "\n%s: ", name); - linepos = namelen; + fprintf(out, "\n%s: ", name); + linepos = namelen; } - mp2 = getm( cp, NULL, 0, AD_HOST, NULL); + mp2 = getm(cp, NULL, 0, AD_HOST, NULL); if (akvisible()) { mp2->m_pers = getcpy(mp->m_mbox); - linepos = putone( adrformat(mp2), linepos, namelen ); + linepos = putone(adrformat(mp2), linepos, namelen); } else { - linepos = putone( mp2->m_text, linepos, namelen ); + linepos = putone(mp2->m_text, + linepos, + namelen); } - mnfree( mp2 ); + mnfree(mp2); } + } } else { /* not a local name - use what the user typed */ - linepos = putone( mp->m_text, linepos, namelen ); + linepos = putone(mp->m_text, linepos, namelen); } mp2 = mp; mp = mp->m_next; - mnfree( mp2 ); + mnfree(mp2); } - putc( '\n', out ); + putc('\n', out); } static int @@ -670,19 +623,19 @@ putone(char *adr, int pos, int indent) register int len; static int linepos; - len = strlen( adr ); + len = strlen(adr); if (pos == indent) linepos = pos; else if (linepos+len > OUTPUTLINELEN) { - fprintf( out, ",\n%*s", indent, ""); + fprintf(out, ",\n%*s", indent, ""); linepos = indent; pos += indent + 2; } else { - fputs( ", ", out ); + fputs(", ", out); linepos += 2; pos += 2; } - fputs( adr, out ); + fputs(adr, out); linepos += len; return (pos+len); @@ -711,90 +664,6 @@ insert_fcc(char *name, unsigned char *pp) fccfold[fccind++] = getcpy(cp); } -#if 0 -/* BCC GENERATION */ - -static void -make_bcc_file(void) -{ - pid_t child_id; - int fd, i, status; - char *vec[6]; - FILE * in, *out; - -#ifdef HAVE_MKSTEMP - fd = mkstemp(bccfil); - if (fd == -1 || (out = fdopen(fd, "w")) == NULL) - adios(bccfil, "unable to create"); -#else - mktemp(bccfil); - if ((out = fopen(bccfil, "w")) == NULL) - adios(bccfil, "unable to create"); -#endif - chmod(bccfil, 0600); - - fprintf(out, "Date: %s\n", dtimenow(0)); - if (msgflags & MFRM) { - /* There was already a From: in the draft. Don't add one. */ - if (!draft_from_masquerading) - /* - ** mts.conf didn't contain "masquerade:[...]draft_from[...]" - ** so we'll reveal the user's actual account@thismachine - ** address in a Sender: header (and use it as the envelope - ** From: later). - */ - fprintf(out, "Sender: %s\n", from); - } else - /* Construct a From: header. */ - fprintf(out, "From: %s\n", signature); - if (subject) - fprintf(out, "Subject: %s", subject); - fprintf(out, "BCC:\n\n------- Blind-Carbon-Copy\n\n"); - fflush(out); - - if (filter == NULL) { - if ((fd = open(tmpfil, O_RDONLY)) == NOTOK) - adios(NULL, "unable to re-open"); - cpydgst(fd, fileno(out), tmpfil, bccfil); - close(fd); - } else { - vec[0] = mhbasename(mhlproc); - - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep(5); - switch (child_id) { - case NOTOK: - adios("fork", "unable to"); - - case OK: - dup2(fileno(out), 1); - - i = 1; - vec[i++] = "-forward"; - vec[i++] = "-form"; - vec[i++] = filter; - vec[i++] = tmpfil; - vec[i] = NULL; - - execvp(mhlproc, vec); - adios(mhlproc, "unable to exec"); - - default: - if (status = pidwait(child_id, OK)) - admonish(NULL, "%s lost (status=0%o)", - vec[0], status); - break; - } - } - - fseek(out, 0L, SEEK_END); - fprintf(out, "\n------- End of Blind-Carbon-Copy\n"); - fclose(out); -} -#endif /* if 0 */ - - -/* FCC INTERACTION */ static void fcc(char *file, char *folder) @@ -844,3 +713,33 @@ fcc(char *file, char *folder) fflush(stdout); } + + +/* BCC GENERATION */ + +static void +make_bcc_draft(char *draft) +{ + int fd; + FILE *out; + +#ifdef HAVE_MKSTEMP + fd = mkstemp(bccfil); + if (fd == -1 || (out = fdopen(fd, "w")) == NULL) + adios(bccfil, "unable to create"); +#else + mktemp(bccfil); + if ((out = fopen(bccfil, "w")) == NULL) + adios(bccfil, "unable to create"); +#endif + chmod(bccfil, 0600); + + if (subject) { + fprintf(out, "Subject: BCC: %s", subject); + } else { + fprintf(out, "Subject: BCC: message without subject"); + } + fprintf(out, "%s: %s\n", attach_hdr, draft); + fprintf(out, "------------\n"); + fclose(out); +}