X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpost.c;h=d91e003817c17b5cc46e915dd6b861a6ee137a55;hp=a66e24110b32e767f9477f5353d00f9e6fb1d20a;hb=8f4c5da8971926f7eccc912f7998c343aef3c33b;hpb=e804a366f5091e90f1c0971e2b7546df69f1315a diff --git a/uip/post.c b/uip/post.c index a66e241..d91e003 100644 --- a/uip/post.c +++ b/uip/post.c @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -36,15 +36,7 @@ # include #endif -/* - * Currently smtp and sendmail use - * the same interface for posting. - */ #ifdef SMTPMTS -# define SENDMTS -#endif - -#ifdef SENDMTS # include #endif @@ -52,6 +44,12 @@ # define uptolow(c) ((isalpha(c) && isupper (c)) ? tolower (c) : (c)) #endif +#ifndef CYRUS_SASL +# define SASLminc(a) (a) +#else /* CYRUS_SASL */ +# define SASLminc(a) 0 +#endif /* CYRUS_SASL */ + #define FCCS 10 /* max number of fccs allowed */ /* In the following array of structures, the numeric second field of the @@ -136,6 +134,12 @@ static struct swit switches[] = { { "partno", -6 }, #define QUEUESW 36 { "queued", -6 }, +#define SASLSW 37 + { "sasl", SASLminc(-4) }, +#define SASLMECHSW 38 + { "saslmech", SASLminc(-5) }, +#define USERSW 39 + { "user", SASLminc(-4) }, { NULL, 0 } }; @@ -235,6 +239,9 @@ static int whomsw = 0; /* we are whom not post */ static int checksw = 0; /* whom -check */ static int linepos=0; /* putadr()'s position on the line */ static int nameoutput=0; /* putadr() has output header name */ +static int sasl=0; /* Use SASL auth for SMTP */ +static char *saslmech=NULL; /* Force use of particular SASL mech */ +static char *user=NULL; /* Authenticate as this user */ static unsigned msgflags = 0; /* what we've seen */ @@ -267,14 +274,14 @@ static char *submitmode = "m"; /* deliver to mailbox only */ static char submitopts[6] = "vl"; /* initial options for submit */ #endif /* MMDFMTS */ -#ifdef SENDMTS +#ifdef SMTPMTS static int snoop = 0; static int smtpmode = S_MAIL; static char *clientsw = NULL; static char *serversw = NULL; extern struct smtp sm_reply; -#endif /* SENDMTS */ +#endif /* SMTPMTS */ static char prefix[] = "----- =_aaaaaaaaaa"; @@ -283,7 +290,7 @@ static char *fill_in = NULL; static char *partno = NULL; static int queued = 0; -extern int MMailids; +extern boolean draft_from_masquerading; /* defined in mts.c */ /* * static prototypes @@ -475,7 +482,7 @@ main (int argc, char **argv) adios (NULL, "missing argument to %s", argp[-2]); continue; -#ifndef SENDMTS +#ifndef SMTPMTS case CLIESW: case SERVSW: if (!(cp = *argp++) || *cp == '-') @@ -484,7 +491,7 @@ main (int argc, char **argv) case SNOOPSW: continue; -#else /* SENDMTS */ +#else /* SMTPMTS */ case MAILSW: smtpmode = S_MAIL; continue; @@ -508,7 +515,7 @@ main (int argc, char **argv) case SNOOPSW: snoop++; continue; -#endif /* SENDMTS */ +#endif /* SMTPMTS */ case FILLSW: if (!(fill_in = *argp++) || *fill_in == '-') @@ -525,6 +532,20 @@ main (int argc, char **argv) case QUEUESW: queued++; continue; + + case SASLSW: + sasl++; + continue; + + case SASLMECHSW: + if (!(saslmech = *argp++) || *saslmech == '-') + adios (NULL, "missing argument to %s", argp[-2]); + continue; + + case USERSW: + if (!(user = *argp++) || *user == '-') + adios (NULL, "missing argument to %s", argp[-2]); + continue; } } if (msg) @@ -726,14 +747,6 @@ putfmt (char *name, char *str, FILE *out) tmpaddrs.m_next = NULL; for (count = 0; (cp = getname (str)); count++) if ((mp = getm (cp, NULL, 0, AD_HOST, NULL))) { - if (MMailids && (hdr->set & MFRM)) - /* The user manually specified a From: address in their draft - and mts.conf turned on "mmailid", so we'll set things up to - use the actual email address embedded in the draft From: - (without the GECOS full name or angle brackets) as the - envelope From:. */ - strncpy(from, auxformat(mp, 0), sizeof(from) - 1); - if (tmpaddrs.m_next) np->m_next = mp; else @@ -764,7 +777,8 @@ putfmt (char *name, char *str, FILE *out) for (grp = 0, mp = tmpaddrs.m_next; mp; mp = np) if (mp->m_nohost) { /* also used to test (hdr->flags & HTRY) */ - pp = akvalue (mp->m_mbox); + /* The address doesn't include a host, so it might be an alias. */ + pp = akvalue (mp->m_mbox); /* do mh alias substitution */ qp = akvisible () ? mp->m_mbox : ""; np = mp; if (np->m_gname) @@ -774,6 +788,19 @@ putfmt (char *name, char *str, FILE *out) badadr++; continue; } + + if (draft_from_masquerading && ((msgstate == RESENT) + ? (hdr->set & MRFM) + : (hdr->set & MFRM))) + /* The user manually specified a [Resent-]From: address in + their draft and the "masquerade:" line in mts.conf + doesn't contain "draft_from", so we'll set things up to + use the actual email address embedded in the draft + [Resent-]From: (after alias substitution, and without the + GECOS full name or angle brackets) as the envelope + From:. */ + strncpy(from, auxformat(mp, 0), sizeof(from) - 1); + if (hdr->flags & HBCC) mp->m_bcc++; if (np->m_ingrp) @@ -793,6 +820,19 @@ putfmt (char *name, char *str, FILE *out) mnfree (mp); } else { + /* Address includes a host, so no alias substitution is needed. */ + if (draft_from_masquerading && ((msgstate == RESENT) + ? (hdr->set & MRFM) + : (hdr->set & MFRM))) + /* The user manually specified a [Resent-]From: address in + their draft and the "masquerade:" line in mts.conf + doesn't contain "draft_from", so we'll set things up to + use the actual email address embedded in the draft + [Resent-]From: (after alias substitution, and without the + GECOS full name or angle brackets) as the envelope + From:. */ + strncpy(from, auxformat(mp, 0), sizeof(from) - 1); + if (hdr->flags & HBCC) mp->m_bcc++; if (mp->m_gname) @@ -875,10 +915,11 @@ finish_headers (FILE *out) (int) getpid (), (long) tclock, LocalName ()); if (msgflags & MFRM) { /* There was already a From: in the draft. Don't add one. */ - if (!MMailids) - /* mts.conf didn't turn on mmailid, so we'll reveal the - user's actual account@thismachine address in a Sender: - header (and use it as the envelope From: later). */ + 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 @@ -911,9 +952,17 @@ finish_headers (FILE *out) if (msgid) fprintf (out, "Resent-Message-ID: <%d.%ld@%s>\n", (int) getpid (), (long) tclock, LocalName ()); - if (msgflags & MRFM) - fprintf (out, "Resent-Sender: %s\n", from); + if (msgflags & MRFM) { + /* There was already a Resent-From: in 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, "Resent-Sender: %s\n", from); + } else + /* Construct a Resent-From: header. */ fprintf (out, "Resent-From: %s\n", signature); if (whomsw) break; @@ -1350,10 +1399,10 @@ do_addresses (int bccque, int talk) die (NULL, "problem ending addresses [%s]\n", rp_valstr (retval)); #endif /* MMDFMTS */ -#ifdef SENDMTS +#ifdef SMTPMTS if (rp_isbad (retval = sm_waend ())) die (NULL, "problem ending addresses; %s", rp_string (retval)); -#endif /* SENDMTS */ +#endif /* SMTPMTS */ } @@ -1366,7 +1415,7 @@ do_addresses (int bccque, int talk) * SENDMAIL/SMTP routines */ -#ifdef SENDMTS +#ifdef SMTPMTS static void post (char *file, int bccque, int talk) @@ -1386,7 +1435,8 @@ post (char *file, int bccque, int talk) sigon (); if (rp_isbad (retval = sm_init (clientsw, serversw, watch, verbose, - snoop, onex, queued)) + snoop, onex, queued, sasl, saslmech, + user)) || rp_isbad (retval = sm_winit (smtpmode, from))) die (NULL, "problem initializing server; %s", rp_string (retval)); @@ -1423,7 +1473,8 @@ verify_all_addresses (int talk) sigon (); if (!whomsw || checksw) - if (rp_isbad (retval = sm_init (clientsw, serversw, 0, 0, snoop, 0, 0)) + if (rp_isbad (retval = sm_init (clientsw, serversw, 0, 0, snoop, 0, + 0, 0, 0, 0)) || rp_isbad (retval = sm_winit (smtpmode, from))) die (NULL, "problem initializing server; %s", rp_string (retval)); @@ -1549,7 +1600,7 @@ do_text (char *file, int fd) } } -#endif /* SENDMTS */ +#endif /* SMTPMTS */ /* * MMDF routines @@ -1842,10 +1893,10 @@ sigser (int i) mm_end (NOTOK); #endif /* MMDFMTS */ -#ifdef SENDMTS +#ifdef SMTPMTS if (!whomsw || checksw) sm_end (NOTOK); -#endif /* SENDMTS */ +#endif /* SMTPMTS */ done (1); } @@ -1966,10 +2017,10 @@ die (char *what, char *fmt, ...) mm_end (NOTOK); #endif /* MMDFMTS */ -#ifdef SENDMTS +#ifdef SMTPMTS if (!whomsw || checksw) sm_end (NOTOK); -#endif /* SENDMTS */ +#endif /* SMTPMTS */ va_start(ap, fmt); advertise (what, NULL, fmt, ap);