X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=e1557847060a2178e6b1fd2e858c3a4924c9165d;hp=ef1b08febc408334e5467ca4db48f436b25be541;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=38615191e71744b066425e0c44412b62dbe49cc2 diff --git a/uip/inc.c b/uip/inc.c index ef1b08f..e155784 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -1,201 +1,102 @@ - /* - * inc.c -- incorporate messages from a maildrop into a folder - * - * $Id$ - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** inc.c -- incorporate messages from a maildrop into a folder +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +*/ #ifdef MAILGROUP -/* Revised: Sat Apr 14 17:08:17 PDT 1990 (marvit@hplabs) - * Added hpux hacks to set and reset gid to be "mail" as needed. The reset - * is necessary so inc'ed mail is the group of the inc'er, rather than - * "mail". We setgid to egid only when [un]locking the mail file. This - * is also a major security precaution which will not be explained here. - * - * Fri Feb 7 16:04:57 PST 1992 John Romine - * NB: I'm not 100% sure that this setgid stuff is secure even now. - * - * See the *GROUPPRIVS() macros later. I'm reasonably happy with the setgid - * attribute. Running setuid root is probably not a terribly good idea, though. - * -- Peter Maydell , 04/1998 - * - * Peter Maydell's patch slightly modified for nmh 0.28-pre2. - * Ruud de Rooij Wed, 22 Jul 1998 13:24:22 +0200 - */ +/* +** Revised: Sat Apr 14 17:08:17 PDT 1990 (marvit@hplabs) +** Added hpux hacks to set and reset gid to be "mail" as needed. The reset +** is necessary so inc'ed mail is the group of the inc'er, rather than +** "mail". We setgid to egid only when [un]locking the mail file. This +** is also a major security precaution which will not be explained here. +** +** Fri Feb 7 16:04:57 PST 1992 John Romine +** NB: I'm not 100% sure that this setgid stuff is secure even now. +** +** See the *GROUPPRIVS() macros later. I'm reasonably happy with the setgid +** attribute. Running setuid root is probably not a terribly good idea, though. +** -- Peter Maydell , 04/1998 +** +** Peter Maydell's patch slightly modified for nmh 0.28-pre2. +** Ruud de Rooij Wed, 22 Jul 1998 13:24:22 +0200 +*/ #endif #include #include #include -#ifdef POP -# include -# include -#endif - -#ifdef HESIOD -# include -#endif - #include #include #include #include -#include #include #include -#ifndef POP -# define POPminc(a) (a) -#else -# define POPminc(a) 0 -#endif - -#ifndef RPOP -# define RPOPminc(a) (a) -#else -# define RPOPminc(a) 0 -#endif - -#ifndef APOP -# define APOPminc(a) (a) -#else -# define APOPminc(a) 0 -#endif - -#ifndef KPOP -# define KPOPminc(a) (a) -#else -# define KPOPminc(a) 0 -#endif - -#ifndef CYRUS_SASL -# define SASLminc(a) (a) -#else -# define SASLminc(a) 0 -#endif - static struct swit switches[] = { -#define AUDSW 0 - { "audit audit-file", 0 }, -#define NAUDSW 1 - { "noaudit", 0 }, -#define CHGSW 2 - { "changecur", 0 }, -#define NCHGSW 3 - { "nochangecur", 0 }, -#define FILESW 4 - { "file name", 0 }, -#define FORMSW 5 - { "form formatfile", 0 }, -#define FMTSW 6 - { "format string", 5 }, -#define HOSTSW 7 - { "host hostname", POPminc (-4) }, -#define USERSW 8 - { "user username", POPminc (-4) }, -#define PACKSW 9 - { "pack file", POPminc (-4) }, -#define NPACKSW 10 - { "nopack", POPminc (-6) }, -#define APOPSW 11 - { "apop", APOPminc (-4) }, -#define NAPOPSW 12 - { "noapop", APOPminc (-6) }, -#define RPOPSW 13 - { "rpop", RPOPminc (-4) }, -#define NRPOPSW 14 - { "norpop", RPOPminc (-6) }, -#define SILSW 15 - { "silent", 0 }, -#define NSILSW 16 - { "nosilent", 0 }, -#define TRNCSW 17 - { "truncate", 0 }, -#define NTRNCSW 18 - { "notruncate", 0 }, -#define WIDTHSW 19 - { "width columns", 0 }, -#define VERSIONSW 20 - { "version", 0 }, -#define HELPSW 21 - { "help", 0 }, -#define SNOOPSW 22 - { "snoop", -5 }, -#define KPOPSW 23 - { "kpop", KPOPminc (-4) }, -#define SASLSW 24 - { "sasl", SASLminc(-4) }, -#define SASLMECHSW 25 - { "saslmech", SASLminc(-8) }, -#define PROXYSW 26 - { "proxy command", POPminc(-5) }, - { NULL, 0 } +#define AUDSW 0 + { "audit audit-file", 0 }, +#define NAUDSW 1 + { "noaudit", 0 }, +#define CHGSW 2 + { "changecur", 0 }, +#define NCHGSW 3 + { "nochangecur", 0 }, +#define FILESW 4 + { "file name", 0 }, +#define FORMSW 5 + { "form formatfile", 0 }, +#define SILSW 6 + { "silent", 0 }, +#define NSILSW 7 + { "nosilent", 0 }, +#define TRNCSW 8 + { "truncate", 0 }, +#define NTRNCSW 9 + { "notruncate", 0 }, +#define WIDTHSW 10 + { "width columns", 0 }, +#define VERSIONSW 11 + { "Version", 0 }, +#define HELPSW 12 + { "help", 0 }, + { NULL, 0 }, }; /* - * flags for the mail source - */ -#define INC_FILE 0 -#define INC_POP 1 - -static int inc_type; -static int snoop = 0; - -#ifdef POP -extern char response[]; - -static char *packfile = NULL; -static int size; -static long pos; -static long start; -static long stop; - -static int mbx_style = MMDF_FORMAT; -static int pd = NOTOK; -static FILE *pf = NULL; -#endif /* POP */ - -/* This is an attempt to simplify things by putting all the - * privilege ops into macros. - * *GROUPPRIVS() is related to handling the setgid MAIL property, - * and only applies if MAILGROUP is defined. - * *USERPRIVS() is related to handling the setuid root property, - * and only applies if POP is defined [why does POP => setuid root?] - * Basically, SAVEGROUPPRIVS() is called right at the top of main() - * to initialise things, and then DROPGROUPPRIVS() and GETGROUPPRIVS() - * do the obvious thing. TRYDROPGROUPPRIVS() has to be safe to call - * before DROPUSERPRIVS() is called [this is needed because setgid() - * sets both effective and real uids if euid is root.] - * - * There's probably a better implementation if we're allowed to use - * BSD-style setreuid() rather than using POSIX saved-ids. - * Anyway, if you're euid root it's a bit pointless to drop the group - * permissions... - * - * I'm pretty happy that the security is good provided we aren't setuid root. - * The only things we trust with group=mail privilege are lkfopen() - * and lkfclose(). - */ +** This is an attempt to simplify things by putting all the +** privilege ops into macros. +** *GROUPPRIVS() is related to handling the setgid MAIL property, +** and only applies if MAILGROUP is defined. +** Basically, SAVEGROUPPRIVS() is called right at the top of main() +** to initialise things, and then DROPGROUPPRIVS() and GETGROUPPRIVS() +** do the obvious thing. TRYDROPGROUPPRIVS() has to be safe to call +** before DROPUSERPRIVS() is called [this is needed because setgid() +** sets both effective and real uids if euid is root.] +** +** There's probably a better implementation if we're allowed to use +** BSD-style setreuid() rather than using POSIX saved-ids. +** Anyway, if you're euid root it's a bit pointless to drop the group +** permissions... +** +** I'm pretty happy that the security is good provided we aren't setuid root. +** The only things we trust with group=mail privilege are lkfopen() +** and lkfclose(). +*/ /* - * For setting and returning to "mail" gid - */ +** For setting and returning to "mail" gid +*/ #ifdef MAILGROUP static int return_gid; -#ifndef POP -/* easy case; we're not setuid root, so can drop group privs - * immediately. - */ +/* +** easy case; we're not setuid root, so can drop group privs immediately. +*/ #define TRYDROPGROUPPRIVS() DROPGROUPPRIVS() -#else /* POP ie we are setuid root */ -#define TRYDROPGROUPPRIVS() \ -if (geteuid() != 0) DROPGROUPPRIVS() -#endif #define DROPGROUPPRIVS() setgid(getgid()) #define GETGROUPPRIVS() setgid(return_gid) #define SAVEGROUPPRIVS() return_gid = getegid() @@ -207,847 +108,391 @@ if (geteuid() != 0) DROPGROUPPRIVS() #define SAVEGROUPPRIVS() #endif /* not MAILGROUP */ -#ifdef POP -#define DROPUSERPRIVS() setuid(getuid()) -#else -#define DROPUSERPRIVS() -#endif - -/* these variables have to be globals so that done() can correctly clean up the lockfile */ +/* +** these variables have to be globals so that done() can correctly clean +** up the lockfile +*/ static int locked = 0; static char *newmail; static FILE *in; /* - * prototypes - */ -char *map_name(char *); - -static void inc_done(int); -#ifdef POP -static int pop_action(char *); -static int pop_pack(char *); -static int map_count(void); -#endif +** prototypes +*/ +static void inc_done(int) NORETURN; int -main (int argc, char **argv) +main(int argc, char **argv) { - int chgflag = 1, trnflag = 1; - int noisy = 1, width = 0; - int rpop, i, hghnum, msgnum; - int kpop = 0, sasl = 0; - char *cp, *maildir, *folder = NULL; - char *format = NULL, *form = NULL; - char *host = NULL, *user = NULL, *proxy = NULL; - char *audfile = NULL, *from = NULL, *saslmech = NULL; - char buf[BUFSIZ], **argp, *nfs, **arguments; - struct msgs *mp; - struct stat st, s1; - FILE *aud = NULL; - char b[MAXPATHLEN + 1]; - char *maildir_copy; /* copy of mail directory because the static gets overwritten */ - -#ifdef POP - int nmsgs, nbytes, p = 0; - char *pass = NULL; - char *MAILHOST_env_variable; -#endif - -#ifdef MHE - FILE *mhe = NULL; -#endif - -#ifdef HESIOD - struct hes_postoffice *po; -#endif - - done=inc_done; + int chgflag = 1, trnflag = 1; + int noisy = 1, width = 0; + int hghnum = 0, msgnum = 0; + int incerr = 0; /* + ** <0 if inc hits an error which means it should + ** not truncate mailspool + */ + char *cp, *maildir = NULL, *folder = NULL; + char *form = NULL; + char *audfile = NULL, *from = NULL; + char buf[BUFSIZ], **argp, *fmtstr, **arguments; + struct msgs *mp = NULL; + struct stat st, s1; + FILE *aud = NULL; + char b[MAXPATHLEN + 1]; + /* copy of mail directory because the static gets overwritten */ + char *maildir_copy = NULL; + + done=inc_done; -/* absolutely the first thing we do is save our privileges, - * and drop them if we can. - */ - SAVEGROUPPRIVS(); - TRYDROPGROUPPRIVS(); +/* +** absolutely the first thing we do is save our privileges, +** and drop them if we can. +*/ + SAVEGROUPPRIVS(); + TRYDROPGROUPPRIVS(); #ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - - /* read user profile/context */ - context_read(); - - mts_init (invo_name); - arguments = getarguments (invo_name, argc, argv, 1); - argp = arguments; - -#ifdef POP - /* - * Scheme is: - * use MAILHOST environment variable if present, - * else try Hesiod. - * If that fails, use the default (if any) - * provided by mts.conf in mts_init() - */ - if ((MAILHOST_env_variable = getenv("MAILHOST")) != NULL) - pophost = MAILHOST_env_variable; -# ifdef HESIOD - else if ((po = hes_getmailhost(getusername())) != NULL && - strcmp(po->po_type, "POP") == 0) - pophost = po->po_host; -# endif /* HESIOD */ - /* - * If there is a valid "pophost" entry in mts.conf, - * then use it as the default host. - */ - if (pophost && *pophost) - host = pophost; - - if ((cp = getenv ("MHPOPDEBUG")) && *cp) - snoop++; -#endif /* POP */ - - rpop = 0; - - while ((cp = *argp++)) { - if (*cp == '-') { - switch (smatch (++cp, switches)) { - case AMBIGSW: - ambigsw (cp, switches); - done (1); - case UNKWNSW: - adios (NULL, "-%s unknown", cp); - - case HELPSW: - snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name); - print_help (buf, switches, 1); - done (1); - case VERSIONSW: - print_version(invo_name); - done (1); - - case AUDSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - audfile = getcpy (m_maildir (cp)); - continue; - case NAUDSW: - audfile = NULL; - continue; - - case CHGSW: - chgflag++; - continue; - case NCHGSW: - chgflag = 0; - continue; - - /* - * The flag `trnflag' has the value: - * - * 2 if -truncate is given - * 1 by default (truncating is default) - * 0 if -notruncate is given - */ - case TRNCSW: - trnflag = 2; - continue; - case NTRNCSW: - trnflag = 0; - continue; - - case FILESW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - from = path (cp, TFILE); - - /* - * If the truncate file is in default state, - * change to not truncate. - */ - if (trnflag == 1) - trnflag = 0; - continue; - - case SILSW: - noisy = 0; - continue; - case NSILSW: - noisy++; - continue; - - case FORMSW: - if (!(form = *argp++) || *form == '-') - adios (NULL, "missing argument to %s", argp[-2]); - format = NULL; - continue; - case FMTSW: - if (!(format = *argp++) || *format == '-') - adios (NULL, "missing argument to %s", argp[-2]); - form = NULL; - continue; - - case WIDTHSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - width = atoi (cp); - continue; - - case HOSTSW: - if (!(host = *argp++) || *host == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - case USERSW: - if (!(user = *argp++) || *user == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - - case PACKSW: -#ifndef POP - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); -#else /* POP */ - if (!(packfile = *argp++) || *packfile == '-') - adios (NULL, "missing argument to %s", argp[-2]); -#endif /* POP */ - continue; - case NPACKSW: -#ifdef POP - packfile = NULL; -#endif /* POP */ - continue; - - case APOPSW: - rpop = -1; - continue; - case NAPOPSW: - rpop = 0; - continue; - - case RPOPSW: - rpop = 1; - continue; - case NRPOPSW: - rpop = 0; - continue; - - case KPOPSW: - kpop = 1; - continue; - - case SNOOPSW: - snoop++; - continue; - - case SASLSW: - sasl++; - continue; - - case SASLMECHSW: - if (!(saslmech = *argp++) || *saslmech == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - case PROXYSW: - if (!(proxy = *argp++) || *proxy == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - } - } - if (*cp == '+' || *cp == '@') { - if (folder) - adios (NULL, "only one folder at a time!"); - else - folder = pluspath (cp); - } else { - adios (NULL, "usage: %s [+folder] [switches]", invo_name); - } - } - - /* NOTE: above this point you should use TRYDROPGROUPPRIVS(), - * not DROPGROUPPRIVS(). - */ -#ifdef POP - if (host && !*host) - host = NULL; - if (from || !host || rpop <= 0) - DROPUSERPRIVS(); -#endif /* POP */ - - /* guarantee dropping group priveleges; we might not have done so earlier */ - DROPGROUPPRIVS(); - - /* - * Where are we getting the new mail? - */ - if (from) - inc_type = INC_FILE; -#ifdef POP - else if (host) - inc_type = INC_POP; + setlocale(LC_ALL, ""); #endif - else - inc_type = INC_FILE; - -#ifdef POP - /* - * Are we getting the mail from - * a POP server? - */ - if (inc_type == INC_POP) { - if (user == NULL) - user = getusername (); - if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { - kpop = 1; + invo_name = mhbasename(argv[0]); + + /* read user profile/context */ + context_read(); + + arguments = getarguments(invo_name, argc, argv, 1); + argp = arguments; + + while ((cp = *argp++)) { + if (*cp == '-') { + switch (smatch(++cp, switches)) { + case AMBIGSW: + ambigsw(cp, switches); + done(1); + case UNKWNSW: + adios(NULL, "-%s unknown", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name); + print_help(buf, switches, 1); + done(1); + case VERSIONSW: + print_version(invo_name); + done(1); + + case AUDSW: + if (!(cp = *argp++) || *cp == '-') + adios(NULL, "missing argument to %s", argp[-2]); + audfile = getcpy(expanddir(cp)); + continue; + case NAUDSW: + audfile = NULL; + continue; + + case CHGSW: + chgflag++; + continue; + case NCHGSW: + chgflag = 0; + continue; + + /* + ** The flag `trnflag' has the value: + ** + ** 2 if -truncate is given + ** 1 by default (truncating is default) + ** 0 if -notruncate is given + */ + case TRNCSW: + trnflag = 2; + continue; + case NTRNCSW: + trnflag = 0; + continue; + + case FILESW: + if (!(cp = *argp++) || *cp == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + from = getcpy(expanddir(cp)); + + /* + ** If the truncate file is in default state, + ** change to not truncate. + */ + if (trnflag == 1) + trnflag = 0; + continue; + + case SILSW: + noisy = 0; + continue; + case NSILSW: + noisy++; + continue; + + case FORMSW: + if (!(form = *argp++) || *form == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case WIDTHSW: + if (!(cp = *argp++) || *cp == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + width = atoi(cp); + continue; + } + } + if (*cp == '+' || *cp == '@') { + if (folder) + adios(NULL, "only one folder at a time!"); + else + folder = getcpy(expandfol(cp)); + } else { + adios(NULL, "usage: %s [+folder] [switches]", + invo_name); + } } - if (kpop || sasl || ( rpop > 0)) - pass = getusername (); - else - ruserpass (host, &user, &pass); /* - * initialize POP connection - */ - if (pop_init (host, user, pass, proxy, snoop, kpop ? 1 : rpop, kpop, - sasl, saslmech) == NOTOK) - adios (NULL, "%s", response); - - /* Check if there are any messages */ - if (pop_stat (&nmsgs, &nbytes) == NOTOK) - adios (NULL, "%s", response); + ** NOTE: above this point you should use TRYDROPGROUPPRIVS(), + ** not DROPGROUPPRIVS(). + */ + /* guarantee dropping group priveleges; we might not have done so earlier */ + DROPGROUPPRIVS(); - if (rpop > 0) - DROPUSERPRIVS(); - if (nmsgs == 0) { - pop_quit(); - adios (NULL, "no mail to incorporate"); - } - } -#endif /* POP */ - - /* - * We will get the mail from a file - * (typically the standard maildrop) - */ - - if (inc_type == INC_FILE) { + /* + ** We will get the mail from a file + ** (typically the standard maildrop) + */ if (from) - newmail = from; - else if ((newmail = getenv ("MAILDROP")) && *newmail) - newmail = m_mailpath (newmail); - else if ((newmail = context_find ("maildrop")) && *newmail) - newmail = m_mailpath (newmail); + newmail = from; + else if ((newmail = getenv("MAILDROP")) && *newmail) + newmail = toabsdir(newmail); + else if ((newmail = context_find("maildrop")) && *newmail) + newmail = toabsdir(newmail); else { - newmail = concat (MAILDIR, "/", MAILFIL, NULL); + newmail = concat(mailspool, "/", getusername(), NULL); } - if (stat (newmail, &s1) == NOTOK || s1.st_size == 0) - adios (NULL, "no mail to incorporate"); + if (stat(newmail, &s1) == NOTOK || s1.st_size == 0) + adios(NULL, "no mail to incorporate"); - if ((cp = strdup(newmail)) == (char *)0) - adios (maildir, "error allocating memory to copy newmail"); + if ((cp = strdup(newmail)) == NULL) + adios(NULL, "error allocating memory to copy newmail"); newmail = cp; - } - -#ifdef POP - /* skip the folder setup */ - if ((inc_type == INC_POP) && packfile) - goto go_to_it; -#endif /* POP */ - if (!context_find ("path")) - free (path ("./", TFOLDER)); - if (!folder) - folder = getfolder (0); - maildir = m_maildir (folder); + if (!folder) + folder = getdeffol(); + maildir = toabsdir(folder); - if ((maildir_copy = strdup(maildir)) == (char *)0) - adios (maildir, "error allocating memory to copy maildir"); + if ((maildir_copy = strdup(maildir)) == NULL) + adios(maildir, "error allocating memory to copy maildir"); - if (!folder_exists(maildir)) { - /* If the folder doesn't exist, and we're given the -silent flag, - * just fail. - */ - if (noisy) - create_folder(maildir, 0, done); - else - done (1); - } + create_folder(maildir, noisy ? 0 : 1, done); - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); + if (chdir(maildir) == NOTOK) + adios(maildir, "unable to change directory to"); - /* read folder and create message structure */ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); + /* read folder and create message structure */ + if (!(mp = folder_read(folder))) + adios(NULL, "unable to read folder %s", folder); -#ifdef POP -go_to_it: -#endif /* POP */ - - if (inc_type == INC_FILE) { - if (access (newmail, W_OK) != NOTOK) { - locked++; - if (trnflag) { - SIGNAL (SIGHUP, SIG_IGN); - SIGNAL (SIGINT, SIG_IGN); - SIGNAL (SIGQUIT, SIG_IGN); - SIGNAL (SIGTERM, SIG_IGN); - } + if (access(newmail, W_OK) != NOTOK) { + locked++; + if (trnflag) { + SIGNAL(SIGHUP, SIG_IGN); + SIGNAL(SIGINT, SIG_IGN); + SIGNAL(SIGQUIT, SIG_IGN); + SIGNAL(SIGTERM, SIG_IGN); + } - GETGROUPPRIVS(); /* Reset gid to lock mail file */ - in = lkfopen (newmail, "r"); - DROPGROUPPRIVS(); - if (in == NULL) - adios (NULL, "unable to lock and fopen %s", newmail); - fstat (fileno(in), &s1); + GETGROUPPRIVS(); /* Reset gid to lock mail file */ + in = lkfopen(newmail, "r"); + DROPGROUPPRIVS(); + if (in == NULL) + adios(NULL, "unable to lock and fopen %s", newmail); + fstat(fileno(in), &s1); } else { - trnflag = 0; - if ((in = fopen (newmail, "r")) == NULL) - adios (newmail, "unable to read"); + trnflag = 0; + if ((in = fopen(newmail, "r")) == NULL) + adios(newmail, "unable to read"); } - } - - /* This shouldn't be necessary but it can't hurt. */ - DROPGROUPPRIVS(); - - if (audfile) { - if ((i = stat (audfile, &st)) == NOTOK) - advise (NULL, "Creating Receive-Audit: %s", audfile); - if ((aud = fopen (audfile, "a")) == NULL) - adios (audfile, "unable to append to"); - else if (i == NOTOK) - chmod (audfile, m_gmprot ()); - -#ifdef POP - fprintf (aud, from ? "<> %s -ms %s\n" - : host ? "<> %s -host %s -user %s%s\n" - : "<> %s\n", - dtimenow (0), from ? from : host, user, - rpop < 0 ? " -apop" : rpop > 0 ? " -rpop" : ""); -#else /* POP */ - fprintf (aud, from ? "<> %s -ms %s\n" : "<> %s\n", - dtimenow (0), from); -#endif /* POP */ - } -#ifdef MHE - if (context_find ("mhe")) { - cp = concat (maildir, "/++", NULL); - i = stat (cp, &st); - if ((mhe = fopen (cp, "a")) == NULL) - admonish (cp, "unable to append to"); - else - if (i == NOTOK) - chmod (cp, m_gmprot ()); - free (cp); - } -#endif /* MHE */ + /* This shouldn't be necessary but it can't hurt. */ + DROPGROUPPRIVS(); - /* Get new format string */ - nfs = new_fs (form, format, FORMAT); + if (audfile) { + int i; + if ((i = stat(audfile, &st)) == NOTOK) + advise(NULL, "Creating Receive-Audit: %s", audfile); + if ((aud = fopen(audfile, "a")) == NULL) + adios(audfile, "unable to append to"); + else if (i == NOTOK) + chmod(audfile, m_gmprot()); - if (noisy) { - printf ("Incorporating new mail into %s...\n\n", folder); - fflush (stdout); - } - -#ifdef POP - /* - * Get the mail from a POP server - */ - if (inc_type == INC_POP) { - if (packfile) { - packfile = path (packfile, TFILE); - if (stat (packfile, &st) == NOTOK) { - if (errno != ENOENT) - adios (packfile, "error on file"); - cp = concat ("Create file \"", packfile, "\"? ", NULL); - if (noisy && !getanswer (cp)) - done (1); - free (cp); - } - msgnum = map_count (); - if ((pd = mbx_open (packfile, mbx_style, getuid(), getgid(), m_gmprot())) - == NOTOK) - adios (packfile, "unable to open"); - if ((pf = fdopen (pd, "w+")) == NULL) - adios (NULL, "unable to fdopen %s", packfile); - } else { - hghnum = msgnum = mp->hghmsg; - /* - * Check if we have enough message space for all the new - * messages. If not, then realloc the folder and add enough - * space for all new messages plus 10 additional slots. - */ - if (mp->hghmsg + nmsgs >= mp->hghoff - && !(mp = folder_realloc (mp, mp->lowoff, mp->hghmsg + nmsgs + 10))) - adios (NULL, "unable to allocate folder storage"); + fprintf(aud, from ? "<> %s -ms %s\n" : "<> %s\n", + dtimenow(), from); } - for (i = 1; i <= nmsgs; i++) { - msgnum++; - if (packfile) { - fseek (pf, 0L, SEEK_CUR); - pos = ftell (pf); - size = 0; - fwrite (mmdlm1, 1, strlen (mmdlm1), pf); - start = ftell (pf); - - if (pop_retr (i, pop_pack) == NOTOK) - adios (NULL, "%s", response); - - fseek (pf, 0L, SEEK_CUR); - stop = ftell (pf); - if (fflush (pf)) - adios (packfile, "write error on"); - fseek (pf, start, SEEK_SET); - } else { - cp = getcpy (m_name (msgnum)); - if ((pf = fopen (cp, "w+")) == NULL) - adios (cp, "unable to write"); - chmod (cp, m_gmprot ()); - start = stop = 0L; - - if (pop_retr (i, pop_action) == NOTOK) - adios (NULL, "%s", response); + /* Get new format string */ + fmtstr = new_fs(form, FORMAT); - if (fflush (pf)) - adios (cp, "write error on"); - fseek (pf, 0L, SEEK_SET); - } - switch (p = scan (pf, msgnum, 0, nfs, width, - packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag, - 1, NULL, stop - start, noisy)) { - case SCNEOF: - printf ("%*d empty\n", DMAXFOLDER, msgnum); - break; - - case SCNFAT: - trnflag = 0; - noisy++; - /* advise (cp, "unable to read"); already advised */ - /* fall thru */ - - case SCNERR: - case SCNNUM: - break; - - case SCNMSG: - case SCNENC: - default: - if (aud) - fputs (scanl, aud); -# ifdef MHE - if (mhe) - fputs (scanl, mhe); -# endif /* MHE */ - if (noisy) - fflush (stdout); - if (!packfile) { - clear_msg_flags (mp, msgnum); - set_exists (mp, msgnum); - set_unseen (mp, msgnum); - mp->msgflags |= SEQMOD; - } - break; - } - if (packfile) { - fseek (pf, stop, SEEK_SET); - fwrite (mmdlm2, 1, strlen (mmdlm2), pf); - if (fflush (pf) || ferror (pf)) { - int e = errno; - pop_quit (); - errno = e; - adios (packfile, "write error on"); - } - map_write (packfile, pd, 0, 0L, start, stop, pos, size, noisy); - } else { - if (ferror(pf) || fclose (pf)) { - int e = errno; - unlink (cp); - pop_quit (); - errno = e; - adios (cp, "write error on"); - } - free (cp); - } - - if (trnflag && pop_dele (i) == NOTOK) - adios (NULL, "%s", response); - } - - if (pop_quit () == NOTOK) - adios (NULL, "%s", response); - if (packfile) { - mbx_close (packfile, pd); - pd = NOTOK; + if (noisy) { + printf("Incorporating new mail into %s...\n\n", folder); + fflush(stdout); } - } -#endif /* POP */ - /* - * Get the mail from file (usually mail spool) - */ - if (inc_type == INC_FILE) { - m_unknown (in); /* the MAGIC invocation... */ + /* + ** Get the mail from file (usually mail spool) + */ + thisisanmbox(in); hghnum = msgnum = mp->hghmsg; - for (i = 0;;) { - /* - * Check if we need to allocate more space for message status. - * If so, then add space for an additional 100 messages. - */ - if (msgnum >= mp->hghoff - && !(mp = folder_realloc (mp, mp->lowoff, mp->hghoff + 100))) { - advise (NULL, "unable to allocate folder storage"); - i = NOTOK; - break; - } - -#if 0 - /* copy file from spool to tmp file */ - tmpfilenam = m_scratch ("", invo_name); - if ((fd = creat (tmpfilenam, m_gmprot ())) == NOTOK) - adios (tmpfilenam, "unable to create"); - chmod (tmpfilenam, m_gmprot ()); - if (!(in2 = fdopen (fd, "r+"))) - adios (tmpfilenam, "unable to access"); - cpymsg (in, in2); - - /* link message into folder */ - newmsg = folder_addmsg(mp, tmpfilenam); -#endif - /* create scanline for new message */ - switch (i = scan (in, msgnum + 1, msgnum + 1, nfs, width, - msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) { - case SCNFAT: - case SCNEOF: - break; - - case SCNERR: - if (aud) - fputs ("inc aborted!\n", aud); - advise (NULL, "aborted!"); /* doesn't clean up locks! */ - break; - - case SCNNUM: - advise (NULL, "BUG in %s, number out of range", invo_name); - break; - - default: - advise (NULL, "BUG in %s, scan() botch (%d)", invo_name, i); - break; - - case SCNMSG: - case SCNENC: + for (;;) { /* - * Run the external program hook on the message. - */ - - (void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1); - (void)ext_hook("add-hook", b, (char *)0); - - if (aud) - fputs (scanl, aud); -#ifdef MHE - if (mhe) - fputs (scanl, mhe); -#endif /* MHE */ - if (noisy) - fflush (stdout); - - msgnum++; - mp->hghmsg++; - mp->nummsg++; - if (mp->lowmsg == 0) mp->lowmsg = 1; + ** Check if we need to allocate more space for message status. + ** If so, then add space for an additional 100 messages. + */ + if (msgnum >= mp->hghoff && !(mp = folder_realloc(mp, mp->lowoff, mp->hghoff + 100))) { + advise(NULL, "unable to allocate folder storage"); + incerr = NOTOK; + break; + } - clear_msg_flags (mp, msgnum); - set_exists (mp, msgnum); - set_unseen (mp, msgnum); - mp->msgflags |= SEQMOD; - continue; - } - break; + /* create scanline for new message */ + switch (incerr = scan(in, msgnum + 1, msgnum + 1, + noisy ? fmtstr : NULL, width, + msgnum == hghnum && chgflag, 1)) { + case SCNFAT: + case SCNEOF: + break; + + case SCNERR: + if (aud) + fputs("inc aborted!\n", aud); + /* doesn't clean up locks! */ + advise(NULL, "aborted!"); + break; + + case SCNNUM: + advise(NULL, "BUG in %s, number out of range", + invo_name); + break; + + default: + advise(NULL, "BUG in %s, scan() botch (%d)", + invo_name, incerr); + break; + + case SCNMSG: + /* + ** Run the external program hook on the message. + */ + + snprintf(b, sizeof (b), "%s/%d", maildir_copy, + msgnum + 1); + ext_hook("add-hook", b, NULL); + + if (aud) + fputs(scanl, aud); + if (noisy) + fflush(stdout); + msgnum++; + mp->hghmsg++; + mp->nummsg++; + if (mp->lowmsg == 0) + mp->lowmsg = 1; + clear_msg_flags(mp, msgnum); + set_exists(mp, msgnum); + set_unseen(mp, msgnum); + mp->msgflags |= SEQMOD; + continue; + } + /* + ** If we get here there was some sort of error from scan(), + ** so stop processing anything more from the spool. + */ + break; } - } - -#ifdef POP - if (p < 0) { /* error */ -#else - if (i < 0) { /* error */ -#endif - if (locked) { - GETGROUPPRIVS(); /* Be sure we can unlock mail file */ - (void) lkfclose (in, newmail); in = NULL; - DROPGROUPPRIVS(); /* And then return us to normal privileges */ - } else { - fclose (in); in = NULL; + free(maildir_copy); + + if (incerr < 0) { /* error */ + if (locked) { + GETGROUPPRIVS(); /* Be sure we can unlock mail file */ + lkfclose(in, newmail); in = NULL; + DROPGROUPPRIVS(); /* + ** And then return us to normal + ** privileges + */ + } else { + fclose(in); in = NULL; + } + adios(NULL, "failed"); } - adios (NULL, "failed"); - } - - if (aud) - fclose (aud); -#ifdef MHE - if (mhe) - fclose (mhe); -#endif /* MHE */ + if (aud) + fclose(aud); - if (noisy) - fflush (stdout); + if (noisy) + fflush(stdout); -#ifdef POP - if ((inc_type == INC_POP) && packfile) - done (0); -#endif /* POP */ - - /* - * truncate file we are incorporating from - */ - if (inc_type == INC_FILE) { + /* + ** truncate file we are incorporating from + */ if (trnflag) { - if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime) - advise (NULL, "new messages have arrived!\007"); - else { - if ((i = creat (newmail, 0600)) != NOTOK) - close (i); - else - admonish (newmail, "error zero'ing"); - unlink(map_name(newmail)); - } - } else { - if (noisy) - printf ("%s not zero'd\n", newmail); + if (stat(newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime) + advise(NULL, "new messages have arrived!\007"); + else { + int newfd; + if ((newfd = creat(newmail, 0600)) != NOTOK) + close(newfd); + else + admonish(newmail, "error zero'ing"); + } + } else if (noisy) { + printf("%s not zero'd\n", newmail); } - } - if (msgnum == hghnum) { - admonish (NULL, "no messages incorporated"); - } else { - context_replace (pfolder, folder); /* update current folder */ - if (chgflag) - mp->curmsg = hghnum + 1; - mp->hghmsg = msgnum; - if (mp->lowmsg == 0) - mp->lowmsg = 1; - if (chgflag) /* sigh... */ - seq_setcur (mp, mp->curmsg); - } + if (msgnum == hghnum) { + admonish(NULL, "no messages incorporated"); + } else { + context_replace(curfolder, folder); /* update current folder */ + if (chgflag) + mp->curmsg = hghnum + 1; + mp->hghmsg = msgnum; + if (mp->lowmsg == 0) + mp->lowmsg = 1; + if (chgflag) /* sigh... */ + seq_setcur(mp, mp->curmsg); + } - /* - * unlock the mail spool - */ - if (inc_type == INC_FILE) { + /* + ** unlock the mail spool + */ if (locked) { - GETGROUPPRIVS(); /* Be sure we can unlock mail file */ - (void) lkfclose (in, newmail); in = NULL; - DROPGROUPPRIVS(); /* And then return us to normal privileges */ + GETGROUPPRIVS(); /* Be sure we can unlock mail file */ + lkfclose(in, newmail); in = NULL; + DROPGROUPPRIVS(); /* And then return us to normal privileges */ } else { - fclose (in); in = NULL; + fclose(in); in = NULL; } - } - - seq_setunseen (mp, 0); /* set the Unseen-Sequence */ - seq_save (mp); /* synchronize sequences */ - context_save (); /* save the context file */ - done (0); - return 1; -} - -#if 0 - -/* - * Copy message message from spool into - * temporary file. Massage the "From " line - * while copying. - */ - -cpymsg (FILE *in, FILE *out) -{ - int state; - char *tmpbuf, name[NAMESZ]; - - for (;;) { - state = m_getfld (state, name, tmpbuf, rlwidth, in); - switch (state) { - case FLD: - case FLDPLUS: - break; - case BODY: - break; - case LENERR: - case FMTERR: - break; - case FILEEOF: - break; - default: - } - } + seq_setunseen(mp, 1); /* add new msgs to unseen sequences */ + seq_save(mp); /* synchronize sequences */ + context_save(); /* save the context file */ + done(0); + return 1; } -#endif /* if 0 */ - static void -inc_done (int status) -{ -#ifdef POP - if (packfile && pd != NOTOK) - mbx_close (packfile, pd); -#endif /* POP */ - if (locked) - { - GETGROUPPRIVS(); - lkfclose(in, newmail); - DROPGROUPPRIVS(); - } - exit (status); -} - -#ifdef POP -static int -pop_action (char *s) +inc_done(int status) { - fprintf (pf, "%s\n", s); - stop += strlen (s) + 1; - return 0; /* Is return value used? This was missing before 1999-07-15. */ -} - -static int -pop_pack (char *s) -{ - int j; - char buffer[BUFSIZ]; - - snprintf (buffer, sizeof(buffer), "%s\n", s); - for (j = 0; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++) - continue; - for (j = 0; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++) - continue; - fputs (buffer, pf); - size += strlen (buffer) + 1; - return 0; /* Is return value used? This was missing before 1999-07-15. */ -} - -static int -map_count (void) -{ - int md; - char *cp; - struct drop d; - struct stat st; - - if (stat (packfile, &st) == NOTOK) - return 0; - if ((md = open (cp = map_name (packfile), O_RDONLY)) == NOTOK - || map_chk (cp, md, &d, (long) st.st_size, 1)) { - if (md != NOTOK) - close (md); - return 0; - } - close (md); - return (d.d_id); + if (locked) { + GETGROUPPRIVS(); + lkfclose(in, newmail); + DROPGROUPPRIVS(); + } + exit(status); } -#endif /* POP */