projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BSD 4_4 release
[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 604cbc7..5027aeb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -1,30 +1,57 @@
 /*
  * Copyright (c) 1983 Eric P. Allman
 /*
  * Copyright (c) 1983 Eric P. Allman
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  *
- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #ifndef lint
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)main.c     5.40 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 6/7/93";
 #endif /* not lint */
 
 #define        _DEFINE
 
 #endif /* not lint */
 
 #define        _DEFINE
 
-#include <sys/param.h>
-#include <sys/file.h>
+#include "sendmail.h"
 #include <signal.h>
 #include <sgtty.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
+#include <pwd.h>
 
 # ifdef lint
 char   edata, end;
 
 # ifdef lint
 char   edata, end;
@@ -69,6 +96,9 @@ 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 */
+char           RealUserName[256];      /* the actual user id on this host */
 
 /*
 **  Pointers for setproctitle.
 
 /*
 **  Pointers for setproctitle.
@@ -80,26 +110,17 @@ 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 4       /* highest config version level known */
 
 main(argc, argv, envp)
        int argc;
 
 main(argc, argv, envp)
        int argc;
@@ -107,26 +128,33 @@ main(argc, argv, envp)
        char **envp;
 {
        register char *p;
        char **envp;
 {
        register char *p;
+       register char *q;
        char **av;
        char **av;
-       char *locname;
        extern int finis();
        extern char Version[];
        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[60];                  /* holds MyHostName */
-       extern bool safefile();
+       char *argv0 = argv[0];
+       struct passwd *pw;
+       struct stat stb;
+       char jbuf[MAXHOSTNAMELEN];      /* holds MyHostName */
+       extern int DtableSize;
+       extern int optind;
        extern time_t convtime();
        extern putheader(), putbody();
        extern time_t convtime();
        extern putheader(), putbody();
-       extern ENVELOPE *newenvelope();
        extern void intsig();
        extern char **myhostname();
        extern char *arpadate();
        extern void intsig();
        extern char **myhostname();
        extern char *arpadate();
+       extern char *getauthinfo();
+       extern char *optarg;
        extern char **environ;
 
        /*
        extern char **environ;
 
        /*
@@ -141,13 +169,16 @@ main(argc, argv, envp)
                abort();
        }
        reenter = TRUE;
                abort();
        }
        reenter = TRUE;
-       extern ADDRESS *recipient();
-       bool canrename;
 
 
-# ifndef SYSTEM5
-       /* Enforce use of local time */
+#ifndef SYS5TZ
+       /* enforce use of kernel-supplied time zone information */
        unsetenv("TZ");
        unsetenv("TZ");
-# endif
+#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.
@@ -155,10 +186,20 @@ main(argc, argv, envp)
        */
 
        i = open("/dev/null", O_RDWR);
        */
 
        i = open("/dev/null", O_RDWR);
-       while (i >= 0 && i < 2)
-               i = dup(i);
-       for (i = getdtablesize(); i > 2; --i)
-               (void) close(i);
+       if (fstat(STDIN_FILENO, &stb) < 0)
+               (void) dup2(i, STDIN_FILENO);
+       if (fstat(STDOUT_FILENO, &stb) < 0)
+               (void) dup2(i, STDOUT_FILENO);
+       if (fstat(STDERR_FILENO, &stb) < 0)
+               (void) dup2(i, STDERR_FILENO);
+       (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
@@ -167,20 +208,32 @@ main(argc, argv, envp)
        openlog("sendmail", LOG_PID);
 #endif 
 
        openlog("sendmail", LOG_PID);
 #endif 
 
+       /* set up the blank envelope */
+       BlankEnvelope.e_puthdr = putheader;
+       BlankEnvelope.e_putbody = putbody;
+       BlankEnvelope.e_xfp = NULL;
+       STRUCTCOPY(NullAddress, BlankEnvelope.e_from);
+       CurEnv = &BlankEnvelope;
+       STRUCTCOPY(NullAddress, MainEnvelope.e_from);
+
        /*
        **  Set default values for variables.
        **      These cannot be in initialized data space.
        */
 
        /*
        **  Set default values for variables.
        **      These cannot be in initialized data space.
        */
 
-       setdefaults();
+       setdefaults(&BlankEnvelope);
 
 
-       /* set up the blank envelope */
-       BlankEnvelope.e_puthdr = putheader;
-       BlankEnvelope.e_putbody = putbody;
-       BlankEnvelope.e_xfp = NULL;
-       STRUCTCOPY(NullAddress, BlankEnvelope.e_from);
-       STRUCTCOPY(BlankEnvelope, MainEnvelope);
-       CurEnv = &MainEnvelope;
+       RealUid = getuid();
+       RealGid = getgid();
+
+       pw = getpwuid(RealUid);
+       if (pw != NULL)
+               (void) strcpy(RealUserName, pw->pw_name);
+       else
+               (void) sprintf(RealUserName, "Unknown UID %d", RealUid);
+
+       /* Handle any non-getoptable constructions. */
+       obsolete(argv);
 
        /*
        **  Do a quick prescan of the argument list.
 
        /*
        **  Do a quick prescan of the argument list.
@@ -189,45 +242,63 @@ 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)
+#ifdef __osf__
+#define OPTIONS                "B:b:C:cd:e:F:f:h:Iimno:p:q:r:sTtvx"
+#else
+#define OPTIONS                "B:b:C:cd:e:F:f:h:Iimno:p:q:r:sTtv"
+#endif
+       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;
                }
        }
 
        InChannel = stdin;
        OutChannel = stdout;
 
                }
        }
 
        InChannel = stdin;
        OutChannel = stdout;
 
+# ifdef FROZENCONFIG
        if (!nothaw)
        if (!nothaw)
-               readconfig = !thaw(FreezeFile);
+               readconfig = !thaw(FreezeFile, argv0);
+# else
+       readconfig = TRUE;
+# endif
 
 
-       /* reset the environment after the thaw */
-       for (i = 0; i < MAXUSERENVIRON && envp[i] != NULL; i++)
-               UserEnviron[i] = newstr(envp[i]);
-       UserEnviron[i] = NULL;
+# ifdef SETPROCTITLE
+       /*
+       **  Move the environment so setproctitle can use the space at
+       **  the top of memory.
+       */
+
+       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.
        */
@@ -237,7 +308,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);
@@ -245,11 +316,15 @@ main(argc, argv, envp)
                (void) signal(SIGHUP, intsig);
        (void) signal(SIGTERM, intsig);
        (void) signal(SIGPIPE, SIG_IGN);
                (void) signal(SIGHUP, intsig);
        (void) signal(SIGTERM, intsig);
        (void) signal(SIGPIPE, SIG_IGN);
-       OldUmask = umask(0);
+       OldUmask = umask(022);
        OpMode = MD_DELIVER;
        OpMode = MD_DELIVER;
-       MotherPid = getpid();
        FullName = getenv("NAME");
 
        FullName = getenv("NAME");
 
+#ifdef NAMED_BIND
+       if (tTd(8, 8))
+               _res.options |= RES_DEBUG;
+#endif
+
        errno = 0;
        from = NULL;
 
        errno = 0;
        from = NULL;
 
@@ -258,47 +333,67 @@ main(argc, argv, envp)
                /* initialize some macros, etc. */
                initmacros();
 
                /* initialize some macros, etc. */
                initmacros();
 
-               /* hostname */
-               av = myhostname(jbuf, sizeof jbuf);
-               if (jbuf[0] != '\0')
-               {
-                       register char *q;
-                       extern char *strchr();
+               /* version */
+               define('v', Version, CurEnv);
+       }
 
 
-                       if (tTd(0, 4))
-                               printf("canonical name: %s\n", jbuf);
-                       p = newstr(jbuf);
-                       define('w', p, CurEnv);
+       /* hostname */
+       av = myhostname(jbuf, sizeof jbuf);
+       if (jbuf[0] != '\0')
+       {
+               struct  utsname utsname;
 
 
-                       q = strchr(jbuf, '.');
-                       if (q != NULL)
-                       {
-                               *q++ = '\0';
-                               p = newstr(jbuf);
-                               define('m', q, CurEnv);
-                       }
+               if (tTd(0, 4))
+                       printf("canonical name: %s\n", jbuf);
+               p = newstr(jbuf);
+               define('w', p, CurEnv);
+               setclass('w', p);
+
+               q = strchr(jbuf, '.');
+               if (q != NULL)
+               {
+                       *q++ = '\0';
+                       define('m', q, CurEnv);
+                       p = newstr(jbuf);
                        setclass('w', p);
                }
                        setclass('w', p);
                }
-               while (av != NULL && *av != NULL)
+
+               if (uname(&utsname) >= 0)
+                       p = utsname.nodename;
+               else
                {
                {
-                       if (tTd(0, 4))
-                               printf("\ta.k.a.: %s\n", *av);
-                       setclass('w', *av++);
+                       makelower(jbuf);
+                       p = jbuf;
                }
                }
-
-               /* version */
-               define('v', Version, CurEnv);
+               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)
+       {
+               if (tTd(0, 4))
+                       printf("\ta.k.a.: %s\n", *av);
+               setclass('w', *av++);
        }
 
        /* current time */
        define('b', arpadate((char *) NULL), CurEnv);
 
        }
 
        /* current time */
        define('b', arpadate((char *) NULL), CurEnv);
 
+       /*
+       **  Find our real host name for future logging.
+       */
+
+       p = getauthinfo(STDIN_FILENO);
+       define('_', p, CurEnv);
+
        /*
        ** Crack argv.
        */
 
        av = argv;
        /*
        ** Crack 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)
@@ -307,12 +402,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
@@ -325,84 +422,82 @@ 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_DELIVER:
                          case MD_VERIFY:
                          case MD_TEST:
                          case MD_INITALIAS:
                          case MD_PRINT:
+#ifdef FROZENCONFIG
+                         case MD_FREEZE:
+#endif
+                               OpMode = j;
+                               break;
+
+#ifndef FROZENCONFIG
                          case MD_FREEZE:
                          case MD_FREEZE:
-                               OpMode = p[2];
+                               usrerr("Frozen configurations unsupported");
+                               ExitStat = EX_USAGE;
                                break;
                                break;
+#endif
 
                          default:
 
                          default:
-                               usrerr("Invalid operation mode %c", p[2]);
+                               usrerr("Invalid operation mode %c", j);
                                ExitStat = EX_USAGE;
                                break;
                        }
                        break;
 
                                ExitStat = EX_USAGE;
                                break;
                        }
                        break;
 
+                 case 'B':     /* body type */
+                       CurEnv->e_bodytype = newstr(optarg);
+                       break;
+
                  case 'C':     /* select configuration file (already done) */
                  case 'C':     /* select configuration file (already done) */
+                       if (getuid() != 0)
+                               auth_warning(CurEnv,
+                                       "Processed by %s with -C %s",
+                                       RealUserName, optarg);
                        break;
 
                  case 'd':     /* debugging -- redo in case frozen */
                        tTsetup(tTdvect, sizeof tTdvect, "0-99.1");
                        break;
 
                  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);
+                       if (strcmp(RealUserName, from) != 0)
+                               auth_warning(CurEnv,
+                                       "%s set sender to %s using -%c",
+                                       RealUserName, from, j);
                        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 */
@@ -410,22 +505,46 @@ 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, CurEnv);
+                       break;
+
+                 case 'p':     /* set protocol */
+                       q = strchr(optarg, ':');
+                       if (q != NULL)
+                               *q++ = '\0';
+                       if (*optarg != '\0')
+                               define('r', newstr(optarg), CurEnv);
+                       if (q != NULL && *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);
-                       }
                        (void) unsetenv("HOSTALIASES");
                        (void) unsetenv("HOSTALIASES");
+                       FullName = NULL;
                        queuemode = TRUE;
                        queuemode = TRUE;
-                       QueueIntvl = convtime(&p[2]);
-# else QUEUE
+                       switch (optarg[0])
+                       {
+                         case 'I':
+                               QueueLimitId = newstr(&optarg[1]);
+                               break;
+
+                         case 'R':
+                               QueueLimitRecipient = newstr(&optarg[1]);
+                               break;
+
+                         case 'S':
+                               QueueLimitSender = newstr(&optarg[1]);
+                               break;
+
+                         default:
+                               QueueIntvl = convtime(optarg, 'm');
+                               break;
+                       }
+# 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 */
@@ -434,16 +553,19 @@ 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, CurEnv);
+                       break;
+
+                 case 'e':     /* error message disposition */
+                       setoption(j, optarg, FALSE, TRUE, CurEnv);
                        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, CurEnv);
                        break;
 
 # ifdef DBM
                        break;
 
 # ifdef DBM
@@ -452,24 +574,18 @@ main(argc, argv, envp)
                        break;
 # endif /* DBM */
 
                        break;
 # endif /* DBM */
 
-                 case 'R':     /* log raw recipient info */
-                       p += 2;
-                       if (*p == '\0' && ((p = *++av) == NULL || *p == '-'))
-                       {
-                               usrerr("Bad -R flag");
-                               ExitStat = EX_USAGE;
-                               av--;
-                               break;
-                       }
-                       RcptLogFile = newstr(p);
+# ifdef __osf__
+                 case 'x':     /* random flag that DEC OSF/1 mailx passes */
+                       break;
+# endif
+
+                 default:
+                       ExitStat = EX_USAGE;
+                       finis();
                        break;
                }
        }
                        break;
                }
        }
-
-#ifdef NAMED_BIND
-       if (tTd(8, 1))
-               _res.options |= RES_DEBUG;
-#endif
+       av += optind;
 
        /*
        **  Do basic initialization.
 
        /*
        **  Do basic initialization.
@@ -478,10 +594,46 @@ 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);
+       }
+# ifdef QUEUE
+       if (queuemode && 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);
+               }
+       }
+# endif /* QUEUE */
 
        switch (OpMode)
        {
 
        switch (OpMode)
        {
+# ifdef FROZENCONFIG
          case MD_FREEZE:
                /* this is critical to avoid forgeries of the frozen config */
                (void) setgid(getgid());
          case MD_FREEZE:
                /* this is critical to avoid forgeries of the frozen config */
                (void) setgid(getgid());
@@ -490,38 +642,65 @@ main(argc, argv, envp)
                /* freeze the configuration */
                freeze(FreezeFile);
                exit(EX_OK);
                /* freeze the configuration */
                freeze(FreezeFile);
                exit(EX_OK);
+# endif
 
          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;
+
+         case MD_SMTP:
+               if (RealUid != 0)
+                       auth_warning(CurEnv,
+                               "%s owned process doing -bs",
+                               RealUserName);
+               break;
        }
 
        /* do heuristic mode adjustment */
        if (Verbose)
        {
                /* turn off noconnect option */
        }
 
        /* do heuristic mode adjustment */
        if (Verbose)
        {
                /* turn off noconnect option */
-               setoption('c', "F", TRUE, FALSE);
+               setoption('c', "F", TRUE, FALSE, CurEnv);
 
                /* turn on interactive delivery */
 
                /* turn on interactive delivery */
-               setoption('d', "", TRUE, FALSE);
+               setoption('d', "", TRUE, FALSE, CurEnv);
        }
 
        /* our name for SMTP codes */
        }
 
        /* our name for SMTP codes */
-       expand("\001j", jbuf, &jbuf[sizeof jbuf - 1], CurEnv);
+       expand("\201j", jbuf, &jbuf[sizeof jbuf - 1], CurEnv);
        MyHostName = jbuf;
 
        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)
        {
@@ -529,6 +708,10 @@ main(argc, argv, envp)
                exit(EX_SOFTWARE);
        }
 
                exit(EX_SOFTWARE);
        }
 
+       /* if we've had errors so far, exit now */
+       if (ExitStat != EX_OK)
+               exit(ExitStat);
+
        /*
        **  Do operation-mode-dependent initialization.
        */
        /*
        **  Do operation-mode-dependent initialization.
        */
@@ -541,14 +724,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);
+               initmaps(TRUE, CurEnv);
                exit(EX_OK);
 
          case MD_DAEMON:
                exit(EX_OK);
 
          case MD_DAEMON:
@@ -557,7 +740,7 @@ main(argc, argv, envp)
 
          default:
                /* open the alias database */
 
          default:
                /* open the alias database */
-               initaliases(AliasFile, FALSE);
+               initmaps(FALSE, CurEnv);
                break;
        }
 
                break;
        }
 
@@ -572,14 +755,26 @@ main(argc, argv, envp)
 
                        if (m == NULL)
                                continue;
 
                        if (m == NULL)
                                continue;
-                       printf("mailer %d (%s): P=%s S=%d R=%d M=%ld F=", i, m->m_name,
-                               m->m_mailer, m->m_s_rwset, m->m_r_rwset,
-                               m->m_maxsize);
+                       printf("mailer %d (%s): P=%s S=%d/%d R=%d/%d M=%ld F=", i, m->m_name,
+                               m->m_mailer, m->m_se_rwset, m->m_sh_rwset,
+                               m->m_re_rwset, m->m_rh_rwset, m->m_maxsize);
                        for (j = '\0'; j <= '\177'; j++)
                                if (bitnset(j, m->m_flags))
                                        (void) putchar(j);
                        printf(" E=");
                        xputs(m->m_eol);
                        for (j = '\0'; j <= '\177'; j++)
                                if (bitnset(j, m->m_flags))
                                        (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");
                }
        }
@@ -588,7 +783,7 @@ main(argc, argv, envp)
        **  Switch to the main envelope.
        */
 
        **  Switch to the main envelope.
        */
 
-       CurEnv = newenvelope(&MainEnvelope);
+       CurEnv = newenvelope(&MainEnvelope, CurEnv);
        MainEnvelope.e_flags = BlankEnvelope.e_flags;
 
        /*
        MainEnvelope.e_flags = BlankEnvelope.e_flags;
 
        /*
@@ -599,42 +794,63 @@ main(argc, argv, envp)
        {
                char buf[MAXLINE];
 
        {
                char buf[MAXLINE];
 
-               printf("ADDRESS TEST MODE\nEnter <ruleset> <address>\n");
+               if (isatty(fileno(stdin)))
+                       Verbose = TRUE;
+
+               if (Verbose)
+               {
+                       printf("ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)\n");
+                       printf("Enter <ruleset> <address>\n");
+               }
                for (;;)
                {
                        register char **pvp;
                        char *q;
                for (;;)
                {
                        register char **pvp;
                        char *q;
-                       extern char *DelimChar;
+                       auto char *delimptr;
+                       extern bool invalidaddr();
 
 
-                       printf("> ");
+                       if (Verbose)
+                               printf("> ");
                        (void) fflush(stdout);
                        if (fgets(buf, sizeof buf, stdin) == NULL)
                                finis();
                        (void) fflush(stdout);
                        if (fgets(buf, sizeof buf, stdin) == NULL)
                                finis();
-                       for (p = buf; isspace(*p); p++)
+                       if (!Verbose)
+                               printf("> %s", buf);
+                       if (buf[0] == '#')
+                               continue;
+                       for (p = buf; isascii(*p) && isspace(*p); p++)
                                continue;
                        q = p;
                                continue;
                        q = p;
-                       while (*p != '\0' && !isspace(*p))
+                       while (*p != '\0' && !(isascii(*p) && isspace(*p)))
                                p++;
                        if (*p == '\0')
                                p++;
                        if (*p == '\0')
+                       {
+                               printf("No address!\n");
                                continue;
                                continue;
+                       }
                        *p = '\0';
                        *p = '\0';
+                       if (invalidaddr(p + 1))
+                               continue;
                        do
                        {
                        do
                        {
-                               extern char **prescan();
                                char pvpbuf[PSBUFSIZE];
 
                                char pvpbuf[PSBUFSIZE];
 
-                               pvp = prescan(++p, ',', pvpbuf);
+                               pvp = prescan(++p, ',', pvpbuf, &delimptr);
                                if (pvp == NULL)
                                        continue;
                                if (pvp == NULL)
                                        continue;
-                               rewrite(pvp, 3);
                                p = q;
                                while (*p != '\0')
                                {
                                p = q;
                                while (*p != '\0')
                                {
-                                       rewrite(pvp, atoi(p));
+                                       int stat;
+
+                                       stat = rewrite(pvp, atoi(p), CurEnv);
+                                       if (stat != EX_OK)
+                                               printf("== Ruleset %s status %d\n",
+                                                       p, stat);
                                        while (*p != '\0' && *p++ != ',')
                                                continue;
                                }
                                        while (*p != '\0' && *p++ != ',')
                                                continue;
                                }
-                       } while (*(p = DelimChar) != '\0');
+                       } while (*(p = delimptr) != '\0');
                }
        }
 
                }
        }
 
@@ -648,7 +864,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.
@@ -661,6 +877,8 @@ main(argc, argv, envp)
 
        if (OpMode == MD_DAEMON || QueueIntvl != 0)
        {
 
        if (OpMode == MD_DAEMON || QueueIntvl != 0)
        {
+               char dtype[200];
+
                if (!tTd(0, 1))
                {
                        /* put us in background */
                if (!tTd(0, 1))
                {
                        /* put us in background */
@@ -670,13 +888,26 @@ main(argc, argv, envp)
                        if (i != 0)
                                exit(0);
 
                        if (i != 0)
                                exit(0);
 
-                       /* get our pid right */
-                       MotherPid = getpid();
-
                        /* disconnect from our controlling tty */
                        /* disconnect from our controlling tty */
-                       disconnect(TRUE);
+                       disconnect(TRUE, CurEnv);
                }
 
                }
 
+               dtype[0] = '\0';
+               if (OpMode == MD_DAEMON)
+                       strcat(dtype, "+SMTP");
+               if (QueueIntvl != 0)
+               {
+                       strcat(dtype, "+queueing@");
+                       strcat(dtype, pintvl(QueueIntvl, TRUE));
+               }
+               if (tTd(0, 1))
+                       strcat(dtype, "+debugging");
+
+               syslog(LOG_INFO, "starting daemon (%s): %s", Version, dtype + 1);
+#ifdef XLA
+               xla_create_file();
+#endif
+
 # ifdef QUEUE
                if (queuemode)
                {
 # ifdef QUEUE
                if (queuemode)
                {
@@ -685,17 +916,23 @@ main(argc, argv, envp)
                                for (;;)
                                        pause();
                }
                                for (;;)
                                        pause();
                }
-# endif QUEUE
+# endif /* QUEUE */
                dropenvelope(CurEnv);
 
 #ifdef DAEMON
                getrequests();
 
                /* at this point we are in a child: reset state */
                dropenvelope(CurEnv);
 
 #ifdef DAEMON
                getrequests();
 
                /* at this point we are in a child: reset state */
-               OpMode = MD_SMTP;
-               (void) newenvelope(CurEnv);
-               openxscript(CurEnv);
-#endif DAEMON
+               (void) newenvelope(CurEnv, CurEnv);
+
+               /*
+               **  Get authentication data
+               */
+
+               p = getauthinfo(fileno(InChannel));
+               define('_', p, CurEnv);
+
+#endif /* DAEMON */
        }
        
 # ifdef SMTP
        }
        
 # ifdef SMTP
@@ -705,33 +942,47 @@ 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);
+       /* make sendmail immune from process group signals */
+# ifdef _POSIX_JOB_CONTROL
+       (void) setpgid(0, getpid());
+# else
+# ifndef SYSTEM5
+       (void) setpgrp(0, getpid());
+# endif
+# endif
+
+       initsys(CurEnv);
+       setsender(from, CurEnv, NULL, FALSE);
+       if (macvalue('s', CurEnv) == NULL)
+               define('s', RealHostName, 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, FALSE, CurEnv);
                finis();
        }
        if (OpMode == MD_VERIFY)
                finis();
        }
        if (OpMode == MD_VERIFY)
-               SendMode = SM_VERIFY;
+       {
+               CurEnv->e_sendmode = SM_VERIFY;
+               CurEnv->e_errormode = EM_QUIET;
+       }
 
        /*
        **  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)
@@ -743,7 +994,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, FALSE, CurEnv);
        errno = 0;
 
        /* collect statistics */
        errno = 0;
 
        /* collect statistics */
@@ -759,11 +1010,17 @@ 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);
 
        /*
-       ** All done.
+       **  All done.
+       **      Don't send return error message if in VERIFY mode.
        */
 
        finis();
        */
 
        finis();
@@ -790,14 +1047,22 @@ finis()
        CurEnv->e_to = NULL;
        dropenvelope(CurEnv);
 
        CurEnv->e_to = NULL;
        dropenvelope(CurEnv);
 
+       /* flush any cached connections */
+       mci_flush(TRUE, NULL);
+
        /* post statistics */
        poststats(StatFile);
 
        /* post statistics */
        poststats(StatFile);
 
+# ifdef XLA
+       /* clean up extended load average stuff */
+       xla_all_end();
+# endif
+
        /* and exit */
 # ifdef LOG
        /* and exit */
 # ifdef LOG
-       if (LogLevel > 11)
+       if (LogLevel > 78)
                syslog(LOG_DEBUG, "finis, pid=%d", getpid());
                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);
@@ -823,6 +1088,9 @@ intsig()
 {
        FileName = NULL;
        unlockqueue(CurEnv);
 {
        FileName = NULL;
        unlockqueue(CurEnv);
+#ifdef XLA
+       xla_all_end();
+#endif
        exit(EX_OK);
 }
 \f/*
        exit(EX_OK);
 }
 \f/*
@@ -844,18 +1112,22 @@ intsig()
 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,
-       '{', MATCHLOOKUP,               '}', MATCHELOOKUP,
+       '#', CANONNET,          '@', CANONHOST,         ':', CANONUSER,
+       '>', CALLSUBR,
 
        /* the conditional operations */
 
        /* the conditional operations */
-       '?', CONDIF,    '|', CONDELSE,  '.', CONDFI,
+       '?', CONDIF,            '|', CONDELSE,          '.', CONDFI,
+
+       /* the hostname lookup characters */
+       '[', HOSTBEGIN,         ']', HOSTEND,
+       '(', LOOKUPBEGIN,       ')', LOOKUPEND,
 
 
-       /* and finally the hostname lookup characters */
-       '[', HOSTBEGIN, ']', HOSTEND,
+       /* miscellaneous control characters */
+       '&', MACRODEXPAND,
 
        '\0'
 };
 
        '\0'
 };
@@ -895,6 +1167,8 @@ initmacros()
 **             Writes BSS and malloc'ed memory to freezefile
 */
 
 **             Writes BSS and malloc'ed memory to freezefile
 */
 
+# ifdef FROZENCONFIG
+
 union frz
 {
        char            frzpad[BUFSIZ]; /* insure we are on a BUFSIZ boundary */
 union frz
 {
        char            frzpad[BUFSIZ]; /* insure we are on a BUFSIZ boundary */
@@ -908,13 +1182,21 @@ union frz
        } frzinfo;
 };
 
        } frzinfo;
 };
 
+#if defined(__hpux) || defined(__alpha)
+#define BRK_TYPE        int
+#define SBRK_TYPE       void *
+#else
+#define BRK_TYPE        char *
+#define SBRK_TYPE       char *
+#endif
+
 freeze(freezefile)
        char *freezefile;
 {
        int f;
        union frz fhdr;
 freeze(freezefile)
        char *freezefile;
 {
        int f;
        union frz fhdr;
+       extern SBRK_TYPE sbrk();
        extern char edata, end;
        extern char edata, end;
-       extern char *sbrk();
        extern char Version[];
 
        if (freezefile == NULL)
        extern char Version[];
 
        if (freezefile == NULL)
@@ -952,6 +1234,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.
@@ -961,18 +1244,19 @@ 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;
        register char *p;
        union frz fhdr;
        char hbuf[60];
 {
        int f;
        register char *p;
        union frz fhdr;
        char hbuf[60];
+       struct stat fst, sst;
        extern char edata, end;
        extern char Version[];
        extern char edata, end;
        extern char Version[];
-       extern caddr_t brk();
        extern char **myhostname();
        extern char **myhostname();
-       extern char *macvalue();
+       extern BRK_TYPE brk();
 
        if (freezefile == NULL)
                return (FALSE);
 
        if (freezefile == NULL)
                return (FALSE);
@@ -985,6 +1269,22 @@ thaw(freezefile)
                return (FALSE);
        }
 
                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)
        {
@@ -996,13 +1296,14 @@ thaw(freezefile)
            fhdr.frzinfo.frzend != &end ||
            strcmp(fhdr.frzinfo.frzver, Version) != 0)
        {
            fhdr.frzinfo.frzend != &end ||
            strcmp(fhdr.frzinfo.frzver, Version) != 0)
        {
+               fprintf(stderr, "Wrong version of frozen config file\n");
                syslog(LOG_WARNING, "Wrong version of frozen config file");
                (void) close(f);
                return (FALSE);
        }
 
        /* arrange to have enough space */
                syslog(LOG_WARNING, "Wrong version of frozen config file");
                (void) close(f);
                return (FALSE);
        }
 
        /* arrange to have enough space */
-       if (brk(fhdr.frzinfo.frzbrk) == (caddr_t) -1)
+       if (brk(fhdr.frzinfo.frzbrk) == (BRK_TYPE) -1)
        {
                syserr("Cannot break to %x", fhdr.frzinfo.frzbrk);
                (void) close(f);
        {
                syserr("Cannot break to %x", fhdr.frzinfo.frzbrk);
                (void) close(f);
@@ -1032,6 +1333,8 @@ thaw(freezefile)
                p, hbuf);
        return (FALSE);
 }
                p, hbuf);
        return (FALSE);
 }
+
+# endif /* FROZENCONFIG */
 \f/*
 **  DISCONNECT -- remove our connection with any foreground process
 **
 \f/*
 **  DISCONNECT -- remove our connection with any foreground process
 **
@@ -1050,14 +1353,15 @@ thaw(freezefile)
 **             the controlling tty.
 */
 
 **             the controlling tty.
 */
 
-disconnect(fulldrop)
+disconnect(fulldrop, e)
        bool fulldrop;
        bool fulldrop;
+       register ENVELOPE *e;
 {
        int fd;
 
        if (tTd(52, 1))
 {
        int fd;
 
        if (tTd(52, 1))
-               printf("disconnect: In %d Out %d\n", fileno(InChannel),
-                                               fileno(OutChannel));
+               printf("disconnect: In %d Out %d, e=%x\n",
+                       fileno(InChannel), fileno(OutChannel), e);
        if (tTd(52, 5))
        {
                printf("don't\n");
        if (tTd(52, 5))
        {
                printf("don't\n");
@@ -1071,7 +1375,7 @@ disconnect(fulldrop)
 
        /* we can't communicate with our caller, so.... */
        HoldErrs = TRUE;
 
        /* we can't communicate with our caller, so.... */
        HoldErrs = TRUE;
-       ErrorMode = EM_MAIL;
+       CurEnv->e_errormode = EM_MAIL;
        Verbose = FALSE;
 
        /* all input from /dev/null */
        Verbose = FALSE;
 
        /* all input from /dev/null */
@@ -1088,20 +1392,20 @@ disconnect(fulldrop)
                (void) fclose(OutChannel);
                OutChannel = stdout;
        }
                (void) fclose(OutChannel);
                OutChannel = stdout;
        }
-       if (CurEnv->e_xfp == NULL)
-               CurEnv->e_xfp = fopen("/dev/null", "w");
+       if (e->e_xfp == NULL)
+               fd = open("/dev/null", O_WRONLY, 0666);
+       else
+               fd = fileno(e->e_xfp);
        (void) fflush(stdout);
        (void) fflush(stdout);
-       (void) close(1);
-       (void) close(2);
-       while ((fd = dup(fileno(CurEnv->e_xfp))) < 2 && fd > 0)
-               continue;
+       dup2(fd, STDOUT_FILENO);
+       dup2(fd, STDERR_FILENO);
+       if (e->e_xfp == NULL)
+               close(fd);
 
        /* drop our controlling TTY completely if possible */
        if (fulldrop)
        {
 
        /* drop our controlling TTY completely if possible */
        if (fulldrop)
        {
-#if BSD > 43
-               daemon(1, 1);
-#else
+               (void) setsid();
 #ifdef TIOCNOTTY
                fd = open("/dev/tty", 2);
                if (fd >= 0)
 #ifdef TIOCNOTTY
                fd = open("/dev/tty", 2);
                if (fd >= 0)
@@ -1111,14 +1415,90 @@ disconnect(fulldrop)
                }
                (void) setpgrp(0, 0);
 #endif /* TIOCNOTTY */
                }
                (void) setpgrp(0, 0);
 #endif /* TIOCNOTTY */
-#endif /* BSD */
                errno = 0;
        }
 
 # ifdef LOG
                errno = 0;
        }
 
 # ifdef LOG
-       if (LogLevel > 11)
+       if (LogLevel > 71)
                syslog(LOG_DEBUG, "in background, pid=%d", getpid());
                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) != NULL)
+       {
+               /* 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 || !isdigit(argv[1][0])))
+                       *argv = "-d0-99.1";
+       }
+}
+\f/*
+**  AUTH_WARNING -- specify authorization warning
+**
+**     Parameters:
+**             e -- the current envelope.
+**             msg -- the text of the message.
+**             args -- arguments to the message.
+**
+**     Returns:
+**             none.
+*/
+
+void
+#ifdef __STDC__
+auth_warning(register ENVELOPE *e, const char *msg, ...)
+#else
+auth_warning(e, msg, va_alist)
+       register ENVELOPE *e;
+       const char *msg;
+       va_dcl
+#endif
+{
+       char buf[MAXLINE];
+       VA_LOCAL_DECL
+
+       if (bitset(PRIV_AUTHWARNINGS, PrivacyFlags))
+       {
+               register char *p;
+               static char hostbuf[48];
+               extern char **myhostname();
+
+               if (hostbuf[0] == '\0')
+                       (void) myhostname(hostbuf, sizeof hostbuf);
+
+               (void) sprintf(buf, "%s: ", hostbuf);
+               p = &buf[strlen(buf)];
+               VA_START(msg);
+               vsprintf(p, msg, ap);
+               VA_END;
+               addheader("X-Authentication-Warning", buf, e);
+       }
+}
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.