BSD 4_4_Lite1 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 8bf58b7..e2af9df 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -3,7 +3,33 @@
  * Copyright (c) 1988, 1993
  *     The 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


@@ -13,14 +39,13 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     8.44 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.55 (Berkeley) 4/15/94";

 #endif /* not lint */
 
 #define        _DEFINE
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #define        _DEFINE
 
 #include "sendmail.h"

-#include <sgtty.h>
-#ifdef NAMED_BIND
+#if NAMED_BIND

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


@@ -102,7 +127,6 @@ main(argc, argv, envp)
 {
        register char *p;
        char **av;
 {
        register char *p;
        char **av;

-       char *locname;

        extern int finis();
        extern char Version[];
        char *ep, *from;
        extern int finis();
        extern char Version[];
        char *ep, *from;


@@ -130,7 +154,7 @@ main(argc, argv, envp)
        extern char *getcfname();
        extern char *optarg;
        extern char **environ;
        extern char *getcfname();
        extern char *optarg;
        extern char **environ;

-       extern void dumpstate();
+       extern void sigusr1();

 
        /*
        **  Check to see if we reentered.
 
        /*
        **  Check to see if we reentered.


@@ -144,15 +168,13 @@ main(argc, argv, envp)
                abort();
        }
        reenter = TRUE;
                abort();
        }
        reenter = TRUE;

-       extern ADDRESS *recipient();
-       bool canrename;

 
        /* do machine-dependent initializations */
        init_md(argc, argv);
 
        /* arrange to dump state on signal */
 #ifdef SIGUSR1
 
        /* do machine-dependent initializations */
        init_md(argc, argv);
 
        /* arrange to dump state on signal */
 #ifdef SIGUSR1

-       setsignal(SIGUSR1, dumpstate);
+       setsignal(SIGUSR1, sigusr1);

 #endif
 
        /* in 4.4BSD, the table can be huge; impose a reasonable limit */
 #endif
 
        /* in 4.4BSD, the table can be huge; impose a reasonable limit */


@@ -165,7 +187,7 @@ main(argc, argv, envp)
        **      But also be sure that 0, 1, & 2 are open.
        */
 
        **      But also be sure that 0, 1, & 2 are open.
        */
 

-       i = open("/dev/null", O_RDWR);
+       i = open("/dev/null", O_RDWR, 0);

        if (fstat(STDIN_FILENO, &stb) < 0 && errno != EOPNOTSUPP)
                (void) dup2(i, STDIN_FILENO);
        if (fstat(STDOUT_FILENO, &stb) < 0 && errno != EOPNOTSUPP)
        if (fstat(STDIN_FILENO, &stb) < 0 && errno != EOPNOTSUPP)
                (void) dup2(i, STDIN_FILENO);
        if (fstat(STDOUT_FILENO, &stb) < 0 && errno != EOPNOTSUPP)


@@ -183,10 +205,12 @@ main(argc, argv, envp)
        }
        errno = 0;
 
        }
        errno = 0;
 

-#ifdef LOG_MAIL
+#ifdef LOG
+# ifdef LOG_MAIL

        openlog("sendmail", LOG_PID, LOG_MAIL);
        openlog("sendmail", LOG_PID, LOG_MAIL);

-#else 
+# else 

        openlog("sendmail", LOG_PID);
        openlog("sendmail", LOG_PID);

+# endif

 #endif 
 
        /* set up the blank envelope */
 #endif 
 
        /* set up the blank envelope */


@@ -194,8 +218,8 @@ main(argc, argv, envp)
        BlankEnvelope.e_putbody = putbody;
        BlankEnvelope.e_xfp = NULL;
        STRUCTCOPY(NullAddress, BlankEnvelope.e_from);
        BlankEnvelope.e_putbody = putbody;
        BlankEnvelope.e_xfp = NULL;
        STRUCTCOPY(NullAddress, BlankEnvelope.e_from);

-       STRUCTCOPY(BlankEnvelope, MainEnvelope);
-       CurEnv = &MainEnvelope;
+       CurEnv = &BlankEnvelope;
+       STRUCTCOPY(NullAddress, MainEnvelope.e_from);

 
        /*
        **  Set default values for variables.
 
        /*
        **  Set default values for variables.


@@ -298,7 +322,7 @@ main(argc, argv, envp)
        OpMode = MD_DELIVER;
        FullName = getenv("NAME");
 
        OpMode = MD_DELIVER;
        FullName = getenv("NAME");
 

-#ifdef NAMED_BIND
+#if NAMED_BIND

        if (tTd(8, 8))
                _res.options |= RES_DEBUG;
 #endif
        if (tTd(8, 8))
                _res.options |= RES_DEBUG;
 #endif


@@ -420,6 +444,9 @@ main(argc, argv, envp)
                          case MD_TEST:
                          case MD_INITALIAS:
                          case MD_PRINT:
                          case MD_TEST:
                          case MD_INITALIAS:
                          case MD_PRINT:

+#ifdef MAYBE_NEXT_RELEASE
+                         case MD_ARPAFTP:
+#endif

                                OpMode = j;
                                break;
 
                                OpMode = j;
                                break;
 


@@ -685,13 +712,6 @@ main(argc, argv, envp)
                /* remove things that don't make sense in daemon mode */
                FullName = NULL;
                break;
                /* 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 */
        }
 
        /* do heuristic mode adjustment */


@@ -967,7 +987,9 @@ main(argc, argv, envp)
                if (tTd(0, 1))
                        strcat(dtype, "+debugging");
 
                if (tTd(0, 1))
                        strcat(dtype, "+debugging");
 

+#ifdef LOG

                syslog(LOG_INFO, "starting daemon (%s): %s", Version, dtype + 1);
                syslog(LOG_INFO, "starting daemon (%s): %s", Version, dtype + 1);

+#endif

 #ifdef XLA
                xla_create_file();
 #endif
 #ifdef XLA
                xla_create_file();
 #endif


@@ -1005,7 +1027,7 @@ main(argc, argv, envp)
        **  commands.  This will never return.
        */
 
        **  commands.  This will never return.
        */
 

-       if (OpMode == MD_SMTP)
+       if (OpMode == MD_SMTP || OpMode == MD_DAEMON)

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


@@ -1188,7 +1210,6 @@ struct metamac    MetaMacros[] =
        /* these are RHS metasymbols */
        '#', CANONNET,          '@', CANONHOST,         ':', CANONUSER,
        '>', CALLSUBR,
        /* these are RHS metasymbols */
        '#', CANONNET,          '@', CANONHOST,         ':', CANONUSER,
        '>', CALLSUBR,

-       '{', MATCHLOOKUP,               '}', MATCHELOOKUP,

 
        /* the conditional operations */
        '?', CONDIF,            '|', CONDELSE,          '.', CONDFI,
 
        /* the conditional operations */
        '?', CONDIF,            '|', CONDELSE,          '.', CONDFI,


@@ -1275,6 +1296,7 @@ disconnect(droplev, e)
        HoldErrs = TRUE;
        CurEnv->e_errormode = EM_MAIL;
        Verbose = FALSE;
        HoldErrs = TRUE;
        CurEnv->e_errormode = EM_MAIL;
        Verbose = FALSE;

+       DisConnected = TRUE;

 
        /* all input from /dev/null */
        if (InChannel != stdin)
 
        /* all input from /dev/null */
        if (InChannel != stdin)


@@ -1326,7 +1348,8 @@ static void
 obsolete(argv)
        char *argv[];
 {
 obsolete(argv)
        char *argv[];
 {

-       char *ap;
+       register char *ap;
+       register char *op;

 
        while ((ap = *++argv) != NULL)
        {
 
        while ((ap = *++argv) != NULL)
        {


@@ -1334,10 +1357,18 @@ obsolete(argv)
                if (ap[0] != '-' || ap[1] == '-')
                        return;
 
                if (ap[0] != '-' || ap[1] == '-')
                        return;
 

+               /* skip over options that do have a value */
+               op = strchr(OPTIONS, ap[1]);
+               if (op != NULL && *++op == ':' && ap[2] == '\0' &&
+                   ap[1] != 'd' && argv[1] != NULL && argv[1][0] != '-')
+               {
+                       argv++;
+                       continue;
+               }
+

                /* If -C doesn't have an argument, use sendmail.cf. */
 #define        __DEFPATH       "sendmail.cf"
                /* 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] == '-'))
+               if (ap[1] == 'C' && ap[2] == '\0')

                {
                        *argv = xalloc(sizeof(__DEFPATH) + 2);
                        argv[0][0] = '-';
                {
                        *argv = xalloc(sizeof(__DEFPATH) + 2);
                        argv[0][0] = '-';


@@ -1346,13 +1377,11 @@ obsolete(argv)
                }
 
                /* If -q doesn't have an argument, run it once. */
                }
 
                /* If -q doesn't have an argument, run it once. */

-               if (ap[1] == 'q' && ap[2] == '\0' &&
-                   (argv[1] == NULL || argv[1][0] == '-'))
+               if (ap[1] == 'q' && ap[2] == '\0')

                        *argv = "-q0";
 
                /* if -d doesn't have an argument, use 0-99.1 */
                        *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])))
+               if (ap[1] == 'd' && ap[2] == '\0')

                        *argv = "-d0-99.1";
        }
 }
                        *argv = "-d0-99.1";
        }
 }


@@ -1399,22 +1428,28 @@ auth_warning(e, msg, va_alist)
        }
 }
 \f/*
        }
 }
 \f/*

-**  DUMPSTATE -- dump state on user signal
+**  DUMPSTATE -- dump state

 **
 **     For debugging.
 */
 
 void
 **
 **     For debugging.
 */
 
 void

-dumpstate()
+dumpstate(when)
+       char *when;

 {
 #ifdef LOG
        register char *j = macvalue('j', CurEnv);
        register STAB *s;
 
 {
 #ifdef LOG
        register char *j = macvalue('j', CurEnv);
        register STAB *s;
 

-       syslog(LOG_DEBUG, "--- dumping state on user signal: $j = %s ---", j);
-       s = stab(j, ST_CLASS, ST_FIND);
-       if (s == NULL || !bitnset('w', s->s_class))
-               syslog(LOG_DEBUG, "*** $j not in $=w ***");
+       syslog(LOG_DEBUG, "--- dumping state on %s: $j = %s ---",
+               when,
+               j == NULL ? "<NULL>" : j);
+       if (j != NULL)
+       {
+               s = stab(j, ST_CLASS, ST_FIND);
+               if (s == NULL || !bitnset('w', s->s_class))
+                       syslog(LOG_DEBUG, "*** $j not in $=w ***");
+       }

        syslog(LOG_DEBUG, "--- open file descriptors: ---");
        printopenfds(TRUE);
        syslog(LOG_DEBUG, "--- connection cache: ---");
        syslog(LOG_DEBUG, "--- open file descriptors: ---");
        printopenfds(TRUE);
        syslog(LOG_DEBUG, "--- connection cache: ---");


@@ -1435,3 +1470,10 @@ dumpstate()
        syslog(LOG_DEBUG, "--- end of state dump ---");
 #endif
 }
        syslog(LOG_DEBUG, "--- end of state dump ---");
 #endif
 }

+
+
+void
+sigusr1()
+{
+       dumpstate("user signal");
+}