fix the System 5 compatilibility to be compatible with the rest

[unix-history] / usr / src / usr.sbin / sendmail / src / main.c

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index df76c6e..9ec75bf 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,18 +13,21 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.33 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     6.13 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 
 #endif /* not lint */
 
 #define        _DEFINE
 

-#include <sys/param.h>
-#include <sys/file.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>

 #include <signal.h>
 #include <sgtty.h>
 #include "sendmail.h"
 #include <signal.h>
 #include <sgtty.h>
 #include "sendmail.h"

+#ifdef NAMED_BIND

 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <arpa/nameser.h>
 #include <resolv.h>

+#endif

 
 # ifdef lint
 char   edata, end;
 
 # ifdef lint
 char   edata, end;


@@ -55,6 +58,7 @@ char  edata, end;
 **             Eric Allman, UCB/INGRES (until 10/81)
 **                          Britton-Lee, Inc., purveyors of fine
 **                             database computers (from 11/81)
 **             Eric Allman, UCB/INGRES (until 10/81)
 **                          Britton-Lee, Inc., purveyors of fine
 **                             database computers (from 11/81)

+**                          Now back at UCB at the Mammoth project.

 **             The support of the INGRES Project and Britton-Lee is
 **                     gratefully acknowledged.  Britton-Lee in
 **                     particular had absolutely nothing to gain from
 **             The support of the INGRES Project and Britton-Lee is
 **                     gratefully acknowledged.  Britton-Lee in
 **                     particular had absolutely nothing to gain from


@@ -68,6 +72,8 @@ ENVELOPE      BlankEnvelope;  /* a "blank" envelope */
 ENVELOPE       MainEnvelope;   /* the envelope around the basic letter */
 ADDRESS                NullAddress =   /* a null address */
                { "", "", NULL, "" };
 ENVELOPE       MainEnvelope;   /* the envelope around the basic letter */
 ADDRESS                NullAddress =   /* a null address */
                { "", "", NULL, "" };

+char           *UserEnviron[MAXUSERENVIRON + 1];
+                               /* saved user environment */

 
 /*
 **  Pointers for setproctitle.
 
 /*
 **  Pointers for setproctitle.


@@ -79,13 +85,30 @@ ADDRESS             NullAddress =   /* a null address */
 # ifdef SETPROCTITLE
 char           **Argv = NULL;          /* pointer to argument vector */
 char           *LastArgv = NULL;       /* end of argv */
 # ifdef SETPROCTITLE
 char           **Argv = NULL;          /* pointer to argument vector */
 char           *LastArgv = NULL;       /* end of argv */

-# endif SETPROCTITLE
+# endif /* SETPROCTITLE */
+
+/*
+**  The file in which to log raw recipient information.
+**     This is logged before aliasing, forwarding, and so forth so we
+**     can see how our addresses are being used.  For example, this
+**     would give us the names of aliases (instead of what they alias
+**     to), the pre-MX hostnames, and so forth.
+**
+**     This is specified on the command line, not in the config file,
+**     and is therefore really only useful for logging SMTP RCPTs.
+*/
+
+char           *RcptLogFile = NULL;    /* file name */
+
+static void    obsolete();

 
 #ifdef DAEMON
 #ifndef SMTP
 ERROR %%%%   Cannot have daemon mode without SMTP   %%%% ERROR
 
 #ifdef DAEMON
 #ifndef SMTP
 ERROR %%%%   Cannot have daemon mode without SMTP   %%%% ERROR

-#endif SMTP
-#endif DAEMON
+#endif /* SMTP */
+#endif /* DAEMON */
+
+#define MAXCONFIGLEVEL 3       /* highest config version level known */

 
 main(argc, argv, envp)
        int argc;
 
 main(argc, argv, envp)
        int argc;


@@ -93,19 +116,25 @@ main(argc, argv, envp)
        char **envp;
 {
        register char *p;
        char **envp;
 {
        register char *p;

+       register char *q;

        char **av;
        char *locname;
        extern int finis();
        extern char Version[];
        char **av;
        char *locname;
        extern int finis();
        extern char Version[];

-       char *from;
+       char *ep, *from;

        typedef int (*fnptr)();
        STAB *st;
        register int i;
        typedef int (*fnptr)();
        STAB *st;
        register int i;

+       int j;

        bool readconfig = TRUE;
        bool queuemode = FALSE;         /* process queue requests */
        bool nothaw;
        bool readconfig = TRUE;
        bool queuemode = FALSE;         /* process queue requests */
        bool nothaw;

+       bool safecf = TRUE;

        static bool reenter = FALSE;
        static bool reenter = FALSE;

-       char jbuf[30];                  /* holds MyHostName */
+       char *argv0 = argv[0];
+       char jbuf[MAXHOSTNAMELEN];      /* holds MyHostName */
+       extern int DtableSize;
+       extern int optind;

        extern bool safefile();
        extern time_t convtime();
        extern putheader(), putbody();
        extern bool safefile();
        extern time_t convtime();
        extern putheader(), putbody();


@@ -113,6 +142,7 @@ main(argc, argv, envp)
        extern void intsig();
        extern char **myhostname();
        extern char *arpadate();
        extern void intsig();
        extern char **myhostname();
        extern char *arpadate();

+       extern char *optarg;

        extern char **environ;
 
        /*
        extern char **environ;
 
        /*


@@ -130,8 +160,15 @@ main(argc, argv, envp)
        extern ADDRESS *recipient();
        bool canrename;
 
        extern ADDRESS *recipient();
        bool canrename;
 

-       /* Enforce use of local time */
+#ifndef SYS5TZ
+       /* enforce use of kernel-supplied time zone information */

        unsetenv("TZ");
        unsetenv("TZ");

+#endif
+
+       /* in 4.4BSD, the table can be huge; impose a reasonable limit */
+       DtableSize = getdtablesize();
+       if (DtableSize > 256)
+               DtableSize = 256;

 
        /*
        **  Be sure we have enough file descriptors.
 
        /*
        **  Be sure we have enough file descriptors.


@@ -141,8 +178,13 @@ main(argc, argv, envp)
        i = open("/dev/null", O_RDWR);
        while (i >= 0 && i < 2)
                i = dup(i);
        i = open("/dev/null", O_RDWR);
        while (i >= 0 && i < 2)
                i = dup(i);

-       for (i = getdtablesize(); i > 2; --i)
-               (void) close(i);
+
+       i = DtableSize;
+       while (--i > 0)
+       {
+               if (i != STDIN_FILENO && i != STDOUT_FILENO && i != STDERR_FILENO)
+                       (void) close(i);
+       }

        errno = 0;
 
 #ifdef LOG_MAIL
        errno = 0;
 
 #ifdef LOG_MAIL


@@ -166,6 +208,9 @@ main(argc, argv, envp)
        STRUCTCOPY(BlankEnvelope, MainEnvelope);
        CurEnv = &MainEnvelope;
 
        STRUCTCOPY(BlankEnvelope, MainEnvelope);
        CurEnv = &MainEnvelope;
 

+       /* Handle any non-getoptable constructions. */
+       obsolete(argv);
+

        /*
        **  Do a quick prescan of the argument list.
        **      We do this to find out if we can potentially thaw the
        /*
        **  Do a quick prescan of the argument list.
        **      We do this to find out if we can potentially thaw the


@@ -173,29 +218,31 @@ main(argc, argv, envp)
        **      the argument processing applies to this run rather than
        **      to the run that froze the configuration.
        */
        **      the argument processing applies to this run rather than
        **      to the run that froze the configuration.
        */

-
-       argv[argc] = NULL;
-       av = argv;

        nothaw = FALSE;
        nothaw = FALSE;

-       while ((p = *++av) != NULL)
+#define OPTIONS                "b:C:cd:e:F:f:h:Iimno:p:q:R:r:sTtv"
+       while ((j = getopt(argc, argv, OPTIONS)) != EOF)

        {
        {

-               if (strncmp(p, "-C", 2) == 0)
+               switch (j)

                {
                {

-                       ConfFile = &p[2];
-                       if (ConfFile[0] == '\0')
-                               ConfFile = "sendmail.cf";
+                 case 'b':
+                       if (optarg[0] == 'z' && optarg[1] == '\0')
+                               nothaw = TRUE;
+                       break;
+
+                 case 'C':
+                       ConfFile = optarg;

                        (void) setgid(getrgid());
                        (void) setuid(getruid());
                        (void) setgid(getrgid());
                        (void) setuid(getruid());

+                       safecf = FALSE;

                        nothaw = TRUE;
                        nothaw = TRUE;

-               }
-               else if (strncmp(p, "-bz", 3) == 0)
-                       nothaw = TRUE;
-               else if (strncmp(p, "-d", 2) == 0)
-               {
+                       break;
+
+                 case 'd':

                        tTsetup(tTdvect, sizeof tTdvect, "0-99.1");
                        tTsetup(tTdvect, sizeof tTdvect, "0-99.1");

-                       tTflag(&p[2]);
+                       tTflag(optarg);

                        setbuf(stdout, (char *) NULL);
                        printf("Version %s\n", Version);
                        setbuf(stdout, (char *) NULL);
                        printf("Version %s\n", Version);

+                       break;

                }
        }
 
                }
        }
 


@@ -203,15 +250,23 @@ main(argc, argv, envp)
        OutChannel = stdout;
 
        if (!nothaw)
        OutChannel = stdout;
 
        if (!nothaw)

-               readconfig = !thaw(FreezeFile);
+               readconfig = !thaw(FreezeFile, argv0);
+
+# ifdef SETPROCTITLE
+       /*
+       **  Move the environment so setproctitle can use the space at
+       **  the top of memory.
+       */

 
 

-       /* reset the environment after the thaw */
-       for (i = 0; i < MAXUSERENVIRON && envp[i] != NULL; i++)
-               UserEnviron[i] = newstr(envp[i]);
-       UserEnviron[i] = NULL;
+       for (i = j = 0; j < MAXUSERENVIRON && (p = envp[i]) != NULL; i++)
+       {
+               if (strncmp(p, "FS=", 3) == 0 || strncmp(p, "LD_", 3) == 0)
+                       continue;
+               UserEnviron[j++] = newstr(p);
+       }
+       UserEnviron[j] = NULL;

        environ = UserEnviron;
 
        environ = UserEnviron;
 

-# ifdef SETPROCTITLE

        /*
        **  Save start and extent of argv for setproctitle.
        */
        /*
        **  Save start and extent of argv for setproctitle.
        */


@@ -221,7 +276,7 @@ main(argc, argv, envp)
                LastArgv = envp[i - 1] + strlen(envp[i - 1]);
        else
                LastArgv = argv[argc - 1] + strlen(argv[argc - 1]);
                LastArgv = envp[i - 1] + strlen(envp[i - 1]);
        else
                LastArgv = argv[argc - 1] + strlen(argv[argc - 1]);

-# endif SETPROCTITLE
+# endif /* SETPROCTITLE */

 
        if (signal(SIGINT, SIG_IGN) != SIG_IGN)
                (void) signal(SIGINT, intsig);
 
        if (signal(SIGINT, SIG_IGN) != SIG_IGN)
                (void) signal(SIGINT, intsig);


@@ -246,10 +301,34 @@ main(argc, argv, envp)
                av = myhostname(jbuf, sizeof jbuf);
                if (jbuf[0] != '\0')
                {
                av = myhostname(jbuf, sizeof jbuf);
                if (jbuf[0] != '\0')
                {

+                       struct  utsname utsname;
+                       extern char *strchr();
+

                        if (tTd(0, 4))
                                printf("canonical name: %s\n", jbuf);
                        p = newstr(jbuf);
                        define('w', p, CurEnv);
                        if (tTd(0, 4))
                                printf("canonical name: %s\n", jbuf);
                        p = newstr(jbuf);
                        define('w', p, CurEnv);

+
+                       q = strchr(jbuf, '.');
+                       if (q != NULL)
+                       {
+                               *q++ = '\0';
+                               p = newstr(jbuf);
+                               define('m', q, CurEnv);
+                       }
+                       setclass('w', p);
+
+                       if (uname(&utsname) >= 0)
+                               p = utsname.nodename;
+                       else
+                       {
+                               makelower(jbuf);
+                               p = jbuf;
+                       }
+                       if (tTd(0, 4))
+                               printf("UUCP nodename: %s\n", p);
+                       p = newstr(p);
+                       define('k', p, CurEnv);

                        setclass('w', p);
                }
                while (av != NULL && *av != NULL)
                        setclass('w', p);
                }
                while (av != NULL && *av != NULL)


@@ -271,7 +350,7 @@ main(argc, argv, envp)
        */
 
        av = argv;
        */
 
        av = argv;

-       p = rindex(*av, '/');
+       p = strrchr(*av, '/');

        if (p++ == NULL)
                p = *av;
        if (strcmp(p, "newaliases") == 0)
        if (p++ == NULL)
                p = *av;
        if (strcmp(p, "newaliases") == 0)


@@ -280,12 +359,14 @@ main(argc, argv, envp)
                OpMode = MD_PRINT;
        else if (strcmp(p, "smtpd") == 0)
                OpMode = MD_DAEMON;
                OpMode = MD_PRINT;
        else if (strcmp(p, "smtpd") == 0)
                OpMode = MD_DAEMON;

-       while ((p = *++av) != NULL && p[0] == '-')
+
+       optind = 1;
+       while ((j = getopt(argc, argv, OPTIONS)) != EOF)

        {
        {

-               switch (p[1])
+               switch (j)

                {
                  case 'b':     /* operations mode */
                {
                  case 'b':     /* operations mode */

-                       switch (p[2])
+                       switch (j = *optarg)

                        {
                          case MD_DAEMON:
 # ifdef DAEMON
                        {
                          case MD_DAEMON:
 # ifdef DAEMON


@@ -298,25 +379,24 @@ main(argc, argv, envp)
                                usrerr("Daemon mode not implemented");
                                ExitStat = EX_USAGE;
                                break;
                                usrerr("Daemon mode not implemented");
                                ExitStat = EX_USAGE;
                                break;

-# endif DAEMON
+# endif /* DAEMON */

                          case MD_SMTP:
 # ifndef SMTP
                                usrerr("I don't speak SMTP");
                                ExitStat = EX_USAGE;
                                break;
                          case MD_SMTP:
 # ifndef SMTP
                                usrerr("I don't speak SMTP");
                                ExitStat = EX_USAGE;
                                break;

-# endif SMTP
-                         case MD_ARPAFTP:
+# endif /* SMTP */

                          case MD_DELIVER:
                          case MD_VERIFY:
                          case MD_TEST:
                          case MD_INITALIAS:
                          case MD_PRINT:
                          case MD_FREEZE:
                          case MD_DELIVER:
                          case MD_VERIFY:
                          case MD_TEST:
                          case MD_INITALIAS:
                          case MD_PRINT:
                          case MD_FREEZE:

-                               OpMode = p[2];
+                               OpMode = j;

                                break;
 
                          default:
                                break;
 
                          default:

-                               usrerr("Invalid operation mode %c", p[2]);
+                               usrerr("Invalid operation mode %c", j);

                                ExitStat = EX_USAGE;
                                break;
                        }
                                ExitStat = EX_USAGE;
                                break;
                        }


@@ -327,55 +407,33 @@ main(argc, argv, envp)
 
                  case 'd':     /* debugging -- redo in case frozen */
                        tTsetup(tTdvect, sizeof tTdvect, "0-99.1");
 
                  case 'd':     /* debugging -- redo in case frozen */
                        tTsetup(tTdvect, sizeof tTdvect, "0-99.1");

-                       tTflag(&p[2]);
+                       tTflag(optarg);

                        setbuf(stdout, (char *) NULL);
                        break;
 
                  case 'f':     /* from address */
                  case 'r':     /* obsolete -f flag */
                        setbuf(stdout, (char *) NULL);
                        break;
 
                  case 'f':     /* from address */
                  case 'r':     /* obsolete -f flag */

-                       p += 2;
-                       if (*p == '\0' && ((p = *++av) == NULL || *p == '-'))
-                       {
-                               p = *++av;
-                               if (p == NULL || *p == '-')
-                               {
-                                       usrerr("No \"from\" person");
-                                       ExitStat = EX_USAGE;
-                                       av--;
-                                       break;
-                               }
-                       }

                        if (from != NULL)
                        {
                                usrerr("More than one \"from\" person");
                                ExitStat = EX_USAGE;
                                break;
                        }
                        if (from != NULL)
                        {
                                usrerr("More than one \"from\" person");
                                ExitStat = EX_USAGE;
                                break;
                        }

-                       from = newstr(p);
+                       from = newstr(optarg);

                        break;
 
                  case 'F':     /* set full name */
                        break;
 
                  case 'F':     /* set full name */

-                       p += 2;
-                       if (*p == '\0' && ((p = *++av) == NULL || *p == '-'))
-                       {
-                               usrerr("Bad -F flag");
-                               ExitStat = EX_USAGE;
-                               av--;
-                               break;
-                       }
-                       FullName = newstr(p);
+                       FullName = newstr(optarg);

                        break;
 
                  case 'h':     /* hop count */
                        break;
 
                  case 'h':     /* hop count */

-                       p += 2;
-                       if (*p == '\0' && ((p = *++av) == NULL || !isdigit(*p)))
+                       CurEnv->e_hopcount = strtol(optarg, &ep, 10);
+                       if (*ep)

                        {
                        {

-                               usrerr("Bad hop count (%s)", p);
+                               usrerr("Bad hop count (%s)", optarg);

                                ExitStat = EX_USAGE;
                                ExitStat = EX_USAGE;

-                               av--;

                                break;
                        }
                                break;
                        }

-                       CurEnv->e_hopcount = atoi(p);

                        break;
                
                  case 'n':     /* don't alias */
                        break;
                
                  case 'n':     /* don't alias */


@@ -383,22 +441,43 @@ main(argc, argv, envp)
                        break;
 
                  case 'o':     /* set option */
                        break;
 
                  case 'o':     /* set option */

-                       setoption(p[2], &p[3], FALSE, TRUE);
+                       setoption(*optarg, optarg + 1, FALSE, TRUE);
+                       break;
+
+                 case 'p':     /* set protocol */
+                       q = strchr(optarg, ':');
+                       if (q != NULL)
+                               *q++ = '\0';
+                       if (*optarg != '\0')
+                               define('r', newstr(optarg), CurEnv);
+                       if (*q != '\0')
+                               define('s', newstr(q), CurEnv);

                        break;
 
                  case 'q':     /* run queue files at intervals */
 # ifdef QUEUE
                        break;
 
                  case 'q':     /* run queue files at intervals */
 # ifdef QUEUE

-                       if (getuid() != 0) {
-                               usrerr("Permission denied");
-                               exit (EX_USAGE);
+                       if (getuid() != 0)
+                       {
+                               struct stat stbuf;
+
+                               /* check to see if we own the queue directory */
+                               if (stat(QueueDir, &stbuf) < 0)
+                                       syserr("main: cannot stat %s", QueueDir);
+                               if (stbuf.st_uid != getuid())
+                               {
+                                       /* nope, really a botch */
+                                       usrerr("Permission denied");
+                                       exit (EX_NOPERM);
+                               }

                        }
                        (void) unsetenv("HOSTALIASES");
                        }
                        (void) unsetenv("HOSTALIASES");

+                       FullName = NULL;

                        queuemode = TRUE;
                        queuemode = TRUE;

-                       QueueIntvl = convtime(&p[2]);
-# else QUEUE
+                       QueueIntvl = convtime(optarg);
+# else /* QUEUE */

                        usrerr("I don't know about queues");
                        ExitStat = EX_USAGE;
                        usrerr("I don't know about queues");
                        ExitStat = EX_USAGE;

-# endif QUEUE
+# endif /* QUEUE */

                        break;
 
                  case 't':     /* read recipients from message */
                        break;
 
                  case 't':     /* read recipients from message */


@@ -407,25 +486,38 @@ main(argc, argv, envp)
 
                        /* compatibility flags */
                  case 'c':     /* connect to non-local mailers */
 
                        /* compatibility flags */
                  case 'c':     /* connect to non-local mailers */

-                 case 'e':     /* error message disposition */

                  case 'i':     /* don't let dot stop me */
                  case 'm':     /* send to me too */
                  case 'T':     /* set timeout interval */
                  case 'v':     /* give blow-by-blow description */
                  case 'i':     /* don't let dot stop me */
                  case 'm':     /* send to me too */
                  case 'T':     /* set timeout interval */
                  case 'v':     /* give blow-by-blow description */

-                       setoption(p[1], &p[2], FALSE, TRUE);
+                       setoption(j, "T", FALSE, TRUE);
+                       break;
+
+                 case 'e':     /* error message disposition */
+                       setoption(j, optarg, FALSE, TRUE);

                        break;
 
                  case 's':     /* save From lines in headers */
                        break;
 
                  case 's':     /* save From lines in headers */

-                       setoption('f', &p[2], FALSE, TRUE);
+                       setoption('f', "T", FALSE, TRUE);

                        break;
 
 # ifdef DBM
                  case 'I':     /* initialize alias DBM file */
                        OpMode = MD_INITALIAS;
                        break;
                        break;
 
 # ifdef DBM
                  case 'I':     /* initialize alias DBM file */
                        OpMode = MD_INITALIAS;
                        break;

-# endif DBM
+# endif /* DBM */
+
+                 case 'R':     /* log raw recipient info */
+                       RcptLogFile = newstr(optarg);
+                       break;
+
+                 default:
+                       ExitStat = EX_USAGE;
+                       finis();
+                       break;

                }
        }
                }
        }

+       av += optind;

 
 #ifdef NAMED_BIND
        if (tTd(8, 1))
 
 #ifdef NAMED_BIND
        if (tTd(8, 1))


@@ -439,8 +531,26 @@ main(argc, argv, envp)
        */
 
        if (OpMode == MD_FREEZE || readconfig)
        */
 
        if (OpMode == MD_FREEZE || readconfig)

-               readcf(ConfFile);
+               readcf(ConfFile, safecf, CurEnv);
+
+#ifdef SYS5TZ
+       /* Enforce use of local time (null string overrides this) */
+       if (TimeZoneSpec == NULL)
+               unsetenv("TZ");
+       else if (TimeZoneSpec[0] != '\0')
+       {
+               p = xalloc(strlen(TimeZoneSpec) + 4);
+               (void) strcpy(p, "TZ=");
+               (void) strcat(p, TimeZoneSpec);
+               putenv(p);
+       }
+#endif

 
 

+       if (ConfigLevel > MAXCONFIGLEVEL)
+       {
+               syserr("Warning: .cf version level (%d) exceeds program functionality (%d)",
+                       ConfigLevel, MAXCONFIGLEVEL);
+       }

        switch (OpMode)
        {
          case MD_FREEZE:
        switch (OpMode)
        {
          case MD_FREEZE:


@@ -455,6 +565,11 @@ main(argc, argv, envp)
          case MD_INITALIAS:
                Verbose = TRUE;
                break;
          case MD_INITALIAS:
                Verbose = TRUE;
                break;

+
+         case MD_DAEMON:
+               /* remove things that don't make sense in daemon mode */
+               FullName = NULL;
+               break;

        }
 
        /* do heuristic mode adjustment */
        }
 
        /* do heuristic mode adjustment */


@@ -471,18 +586,32 @@ main(argc, argv, envp)
        expand("\001j", jbuf, &jbuf[sizeof jbuf - 1], CurEnv);
        MyHostName = jbuf;
 
        expand("\001j", jbuf, &jbuf[sizeof jbuf - 1], CurEnv);
        MyHostName = jbuf;
 

-       /* the indices of local and program mailers */
+       /* the indices of built-in mailers */

        st = stab("local", ST_MAILER, ST_FIND);
        if (st == NULL)
                syserr("No local mailer defined");
        else
                LocalMailer = st->s_mailer;
        st = stab("local", ST_MAILER, ST_FIND);
        if (st == NULL)
                syserr("No local mailer defined");
        else
                LocalMailer = st->s_mailer;

+

        st = stab("prog", ST_MAILER, ST_FIND);
        if (st == NULL)
                syserr("No prog mailer defined");
        else
                ProgMailer = st->s_mailer;
 
        st = stab("prog", ST_MAILER, ST_FIND);
        if (st == NULL)
                syserr("No prog mailer defined");
        else
                ProgMailer = st->s_mailer;
 

+       st = stab("*file*", ST_MAILER, ST_FIND);
+       if (st == NULL)
+               syserr("No *file* mailer defined");
+       else
+               FileMailer = st->s_mailer;
+
+       st = stab("*include*", ST_MAILER, ST_FIND);
+       if (st == NULL)
+               syserr("No *include* mailer defined");
+       else
+               InclMailer = st->s_mailer;
+
+

        /* operate in queue directory */
        if (chdir(QueueDir) < 0)
        {
        /* operate in queue directory */
        if (chdir(QueueDir) < 0)
        {


@@ -502,14 +631,14 @@ main(argc, argv, envp)
                dropenvelope(CurEnv);
                printqueue();
                exit(EX_OK);
                dropenvelope(CurEnv);
                printqueue();
                exit(EX_OK);

-#else QUEUE
+#else /* QUEUE */

                usrerr("No queue to print");
                finis();
                usrerr("No queue to print");
                finis();

-#endif QUEUE
+#endif /* QUEUE */

 
          case MD_INITALIAS:
                /* initialize alias database */
 
          case MD_INITALIAS:
                /* initialize alias database */

-               initaliases(AliasFile, TRUE);
+               initaliases(AliasFile, TRUE, CurEnv);

                exit(EX_OK);
 
          case MD_DAEMON:
                exit(EX_OK);
 
          case MD_DAEMON:


@@ -518,7 +647,7 @@ main(argc, argv, envp)
 
          default:
                /* open the alias database */
 
          default:
                /* open the alias database */

-               initaliases(AliasFile, FALSE);
+               initaliases(AliasFile, FALSE, CurEnv);

                break;
        }
 
                break;
        }
 


@@ -541,6 +670,18 @@ main(argc, argv, envp)
                                        (void) putchar(j);
                        printf(" E=");
                        xputs(m->m_eol);
                                        (void) putchar(j);
                        printf(" E=");
                        xputs(m->m_eol);

+                       if (m->m_argv != NULL)
+                       {
+                               char **a = m->m_argv;
+
+                               printf(" A=");
+                               while (*a != NULL)
+                               {
+                                       if (a != m->m_argv)
+                                               printf(" ");
+                                       xputs(*a++);
+                               }
+                       }

                        printf("\n");
                }
        }
                        printf("\n");
                }
        }


@@ -558,27 +699,43 @@ main(argc, argv, envp)
 
        if (OpMode == MD_TEST)
        {
 
        if (OpMode == MD_TEST)
        {

+               bool terminal = isatty(fileno(stdin));

                char buf[MAXLINE];
 
                char buf[MAXLINE];
 

-               printf("ADDRESS TEST MODE\nEnter <ruleset> <address>\n");
+               if (terminal)
+               {
+                       printf("ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)\n");
+                       printf("Enter <ruleset> <address>\n");
+               }

                for (;;)
                {
                        register char **pvp;
                        char *q;
                        extern char *DelimChar;
                for (;;)
                {
                        register char **pvp;
                        char *q;
                        extern char *DelimChar;

+                       extern bool invalidaddr();

 
 

-                       printf("> ");
+                       if (terminal)
+                               printf("> ");

                        (void) fflush(stdout);
                        if (fgets(buf, sizeof buf, stdin) == NULL)
                                finis();
                        (void) fflush(stdout);
                        if (fgets(buf, sizeof buf, stdin) == NULL)
                                finis();

+                       if (!terminal)
+                               printf("> %s", buf);
+                       if (buf[0] == '#')
+                               continue;

                        for (p = buf; isspace(*p); p++)
                                continue;
                        q = p;
                        while (*p != '\0' && !isspace(*p))
                                p++;
                        if (*p == '\0')
                        for (p = buf; isspace(*p); p++)
                                continue;
                        q = p;
                        while (*p != '\0' && !isspace(*p))
                                p++;
                        if (*p == '\0')

+                       {
+                               printf("No address!\n");

                                continue;
                                continue;

+                       }

                        *p = '\0';
                        *p = '\0';

+                       if (invalidaddr(p + 1))
+                               continue;

                        do
                        {
                                extern char **prescan();
                        do
                        {
                                extern char **prescan();


@@ -587,7 +744,6 @@ main(argc, argv, envp)
                                pvp = prescan(++p, ',', pvpbuf);
                                if (pvp == NULL)
                                        continue;
                                pvp = prescan(++p, ',', pvpbuf);
                                if (pvp == NULL)
                                        continue;

-                               rewrite(pvp, 3);

                                p = q;
                                while (*p != '\0')
                                {
                                p = q;
                                while (*p != '\0')
                                {


@@ -609,7 +765,7 @@ main(argc, argv, envp)
                runqueue(FALSE);
                finis();
        }
                runqueue(FALSE);
                finis();
        }

-# endif QUEUE
+# endif /* QUEUE */

 
        /*
        **  If a daemon, wait for a request.
 
        /*
        **  If a daemon, wait for a request.


@@ -646,7 +802,7 @@ main(argc, argv, envp)
                                for (;;)
                                        pause();
                }
                                for (;;)
                                        pause();
                }

-# endif QUEUE
+# endif /* QUEUE */

                dropenvelope(CurEnv);
 
 #ifdef DAEMON
                dropenvelope(CurEnv);
 
 #ifdef DAEMON


@@ -656,7 +812,7 @@ main(argc, argv, envp)
                OpMode = MD_SMTP;
                (void) newenvelope(CurEnv);
                openxscript(CurEnv);
                OpMode = MD_SMTP;
                (void) newenvelope(CurEnv);
                openxscript(CurEnv);

-#endif DAEMON
+#endif /* DAEMON */

        }
        
 # ifdef SMTP
        }
        
 # ifdef SMTP


@@ -666,23 +822,23 @@ main(argc, argv, envp)
        */
 
        if (OpMode == MD_SMTP)
        */
 
        if (OpMode == MD_SMTP)

-               smtp();
-# endif SMTP
+               smtp(CurEnv);
+# endif /* SMTP */

 
        /*
        **  Do basic system initialization and set the sender
        */
 
 
        /*
        **  Do basic system initialization and set the sender
        */
 

-       initsys();
-       setsender(from);
+       initsys(CurEnv);
+       setsender(from, CurEnv);

 
 

-       if (OpMode != MD_ARPAFTP && *av == NULL && !GrabTo)
+       if (*av == NULL && !GrabTo)

        {
                usrerr("Recipient names must be specified");
 
                /* collect body for UUCP return */
                if (OpMode != MD_VERIFY)
        {
                usrerr("Recipient names must be specified");
 
                /* collect body for UUCP return */
                if (OpMode != MD_VERIFY)

-                       collect(FALSE);
+                       collect(FALSE, CurEnv);

                finis();
        }
        if (OpMode == MD_VERIFY)
                finis();
        }
        if (OpMode == MD_VERIFY)


@@ -692,7 +848,7 @@ main(argc, argv, envp)
        **  Scan argv and deliver the message to everyone.
        */
 
        **  Scan argv and deliver the message to everyone.
        */
 

-       sendtoargv(av);
+       sendtoargv(av, CurEnv);

 
        /* if we have had errors sofar, arrange a meaningful exit stat */
        if (Errors > 0 && ExitStat == EX_OK)
 
        /* if we have had errors sofar, arrange a meaningful exit stat */
        if (Errors > 0 && ExitStat == EX_OK)


@@ -704,7 +860,7 @@ main(argc, argv, envp)
 
        CurEnv->e_to = NULL;
        if (OpMode != MD_VERIFY || GrabTo)
 
        CurEnv->e_to = NULL;
        if (OpMode != MD_VERIFY || GrabTo)

-               collect(FALSE);
+               collect(FALSE, CurEnv);

        errno = 0;
 
        /* collect statistics */
        errno = 0;
 
        /* collect statistics */


@@ -720,6 +876,11 @@ main(argc, argv, envp)
        */
 
        CurEnv->e_from.q_flags |= QDONTSEND;
        */
 
        CurEnv->e_from.q_flags |= QDONTSEND;

+       if (tTd(1, 5))
+       {
+               printf("main: QDONTSEND ");
+               printaddr(&CurEnv->e_from, FALSE);
+       }

        CurEnv->e_to = NULL;
        sendall(CurEnv, SM_DEFAULT);
 
        CurEnv->e_to = NULL;
        sendall(CurEnv, SM_DEFAULT);
 


@@ -751,6 +912,9 @@ finis()
        CurEnv->e_to = NULL;
        dropenvelope(CurEnv);
 
        CurEnv->e_to = NULL;
        dropenvelope(CurEnv);
 

+       /* flush any cached connections */
+       mci_flush();
+

        /* post statistics */
        poststats(StatFile);
 
        /* post statistics */
        poststats(StatFile);
 


@@ -758,7 +922,7 @@ finis()
 # ifdef LOG
        if (LogLevel > 11)
                syslog(LOG_DEBUG, "finis, pid=%d", getpid());
 # ifdef LOG
        if (LogLevel > 11)
                syslog(LOG_DEBUG, "finis, pid=%d", getpid());

-# endif LOG
+# endif /* LOG */

        if (ExitStat == EX_TEMPFAIL)
                ExitStat = EX_OK;
        exit(ExitStat);
        if (ExitStat == EX_TEMPFAIL)
                ExitStat = EX_OK;
        exit(ExitStat);


@@ -802,27 +966,23 @@ intsig()
 **             initializes several macros to be themselves.
 */
 
 **             initializes several macros to be themselves.
 */
 

-struct metamac
-{
-       char    metaname;
-       char    metaval;
-};
-

 struct metamac MetaMacros[] =
 {
        /* LHS pattern matching characters */
 struct metamac MetaMacros[] =
 {
        /* LHS pattern matching characters */

-       '*', MATCHZANY, '+', MATCHANY,  '-', MATCHONE,  '=', MATCHCLASS,
-       '~', MATCHNCLASS,
+       '*', MATCHZANY,         '+', MATCHANY,          '-', MATCHONE,
+       '=', MATCHCLASS,        '~', MATCHNCLASS,

 
        /* these are RHS metasymbols */
 
        /* these are RHS metasymbols */

-       '#', CANONNET,  '@', CANONHOST, ':', CANONUSER, '>', CALLSUBR,
+       '#', CANONNET,          '@', CANONHOST,         ':', CANONUSER,
+       '>', CALLSUBR,

        '{', MATCHLOOKUP,               '}', MATCHELOOKUP,
 
        /* the conditional operations */
        '{', MATCHLOOKUP,               '}', MATCHELOOKUP,
 
        /* the conditional operations */

-       '?', CONDIF,    '|', CONDELSE,  '.', CONDFI,
+       '?', CONDIF,            '|', CONDELSE,          '.', CONDFI,

 
        /* and finally the hostname lookup characters */
 
        /* and finally the hostname lookup characters */

-       '[', HOSTBEGIN, ']', HOSTEND,
+       '[', HOSTBEGIN,         ']', HOSTEND,
+       '(', LOOKUPBEGIN,       ')', LOOKUPEND,

 
        '\0'
 };
 
        '\0'
 };


@@ -919,6 +1079,7 @@ freeze(freezefile)
 **
 **     Parameters:
 **             freezefile -- the name of the file to thaw from.
 **
 **     Parameters:
 **             freezefile -- the name of the file to thaw from.

+**             binfile -- the name of the sendmail binary (ok to guess).

 **
 **     Returns:
 **             TRUE if it successfully read the freeze file.
 **
 **     Returns:
 **             TRUE if it successfully read the freeze file.


@@ -928,14 +1089,20 @@ freeze(freezefile)
 **             reads freezefile in to BSS area.
 */
 
 **             reads freezefile in to BSS area.
 */
 

-thaw(freezefile)
+thaw(freezefile, binfile)

        char *freezefile;
        char *freezefile;

+       char *binfile;

 {
        int f;
 {
        int f;

+       register char *p;

        union frz fhdr;
        union frz fhdr;

+       char hbuf[60];
+       struct stat fst, sst;

        extern char edata, end;
        extern char Version[];
        extern caddr_t brk();
        extern char edata, end;
        extern char Version[];
        extern caddr_t brk();

+       extern char **myhostname();
+       extern char *macvalue();

 
        if (freezefile == NULL)
                return (FALSE);
 
        if (freezefile == NULL)
                return (FALSE);


@@ -944,20 +1111,34 @@ thaw(freezefile)
        f = open(freezefile, 0);
        if (f < 0)
        {
        f = open(freezefile, 0);
        if (f < 0)
        {

-               syslog(LOG_WARNING, "Cannot open frozen config file %s: %m",
-                       freezefile);

                errno = 0;
                return (FALSE);
        }
 
                errno = 0;
                return (FALSE);
        }
 

+       if (fstat(f, &fst) < 0 || stat(ConfFile, &sst) < 0 ||
+           fst.st_mtime < sst.st_mtime)
+       {
+               syslog(LOG_WARNING, "Freeze file older than config file");
+               (void) close(f);
+               return (FALSE);
+       }
+
+       if (strchr(binfile, '/') != NULL && stat(binfile, &sst) == 0 &&
+           fst.st_mtime < sst.st_mtime)
+       {
+               syslog(LOG_WARNING, "Freeze file older than binary file");
+               (void) close(f);
+               return (FALSE);
+       }
+

        /* read in the header */
        if (read(f, (char *) &fhdr, sizeof fhdr) < sizeof fhdr)
        {
        /* read in the header */
        if (read(f, (char *) &fhdr, sizeof fhdr) < sizeof fhdr)
        {

-               syserr("Cannot read frozen config file");
+               syslog(LOG_WARNING, "Cannot read frozen config file");

                (void) close(f);
                return (FALSE);
        }
                (void) close(f);
                return (FALSE);
        }

-       if ( fhdr.frzinfo.frzedata != &edata ||
+       if (fhdr.frzinfo.frzedata != &edata ||

            fhdr.frzinfo.frzend != &end ||
            strcmp(fhdr.frzinfo.frzver, Version) != 0)
        {
            fhdr.frzinfo.frzend != &end ||
            strcmp(fhdr.frzinfo.frzver, Version) != 0)
        {


@@ -985,7 +1166,17 @@ thaw(freezefile)
        }
 
        (void) close(f);
        }
 
        (void) close(f);

-       return (TRUE);
+
+       /* verify that the host name was correct on the freeze */
+       (void) myhostname(hbuf, sizeof hbuf);
+       p = macvalue('w', CurEnv);
+       if (p == NULL)
+               p = "";
+       if (strcmp(hbuf, macvalue('w', CurEnv)) == 0)
+               return (TRUE);
+       syslog(LOG_WARNING, "Hostname changed since freeze (%s => %s)",
+               p, hbuf);
+       return (FALSE);

 }
 \f/*
 **  DISCONNECT -- remove our connection with any foreground process
 }
 \f/*
 **  DISCONNECT -- remove our connection with any foreground process


@@ -1054,9 +1245,11 @@ disconnect(fulldrop)
        /* drop our controlling TTY completely if possible */
        if (fulldrop)
        {
        /* drop our controlling TTY completely if possible */
        if (fulldrop)
        {

-#if BSD > 43
-               daemon(1, 1);
+#ifdef SYSTEM5
+               (void) setpgrp();

 #else
 #else

+               (void) setsid();
+#endif

 #ifdef TIOCNOTTY
                fd = open("/dev/tty", 2);
                if (fd >= 0)
 #ifdef TIOCNOTTY
                fd = open("/dev/tty", 2);
                if (fd >= 0)


@@ -1066,14 +1259,48 @@ disconnect(fulldrop)
                }
                (void) setpgrp(0, 0);
 #endif /* TIOCNOTTY */
                }
                (void) setpgrp(0, 0);
 #endif /* TIOCNOTTY */

-#endif /* BSD */

                errno = 0;
        }
 
 # ifdef LOG
        if (LogLevel > 11)
                syslog(LOG_DEBUG, "in background, pid=%d", getpid());
                errno = 0;
        }
 
 # ifdef LOG
        if (LogLevel > 11)
                syslog(LOG_DEBUG, "in background, pid=%d", getpid());

-# endif LOG
+# endif /* LOG */

 
        errno = 0;
 }
 
        errno = 0;
 }

+
+static void
+obsolete(argv)
+       char *argv[];
+{
+       char *ap;
+
+       while (ap = *++argv)
+       {
+               /* Return if "--" or not an option of any form. */
+               if (ap[0] != '-' || ap[1] == '-')
+                       return;
+
+               /* If -C doesn't have an argument, use sendmail.cf. */
+#define        __DEFPATH       "sendmail.cf"
+               if (ap[1] == 'C' && ap[2] == '\0' &&
+                   (argv[1] == NULL || argv[1][0] == '-'))
+               {
+                       *argv = xalloc(sizeof(__DEFPATH) + 2);
+                       argv[0][0] = '-';
+                       argv[0][1] = 'C';
+                       (void)strcpy(&argv[0][2], __DEFPATH);
+               }
+
+               /* If -q doesn't have an argument, run it once. */
+               if (ap[1] == 'q' && ap[2] == '\0' &&
+                   (argv[1] == NULL || argv[1][0] == '-'))
+                       *argv = "-q0";
+
+               /* if -d doesn't have an argument, use 0-99.1 */
+               if (ap[1] == 'd' && ap[2] == '\0' &&
+                   (argv[1] == NULL || argv[1][0] == '-'))
+                       *argv = "-d0-99.1";
+       }
+}