more cleanup for DSN drafts

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

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index da35dbb..f48b1c9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        8.37 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        8.75 (Berkeley) %G%";

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


@@ -33,6 +33,8 @@ static char sccsid[] = "@(#)recipient.c       8.37 (Berkeley) %G%";
 **                     expansion.
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.
 **                     expansion.
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.

+**             aliaslevel -- the current alias nesting depth -- to
+**                     diagnose loops.

 **             e -- the envelope in which to add these recipients.
 **             qflags -- special flags to set in the q_flags field.
 **
 **             e -- the envelope in which to add these recipients.
 **             qflags -- special flags to set in the q_flags field.
 **


@@ -43,13 +45,18 @@ static char sccsid[] = "@(#)recipient.c     8.37 (Berkeley) %G%";
 **             none.
 */
 
 **             none.
 */
 

-# define MAXRCRSN      10
+#define MAXRCRSN       10      /* maximum levels of alias recursion */

 
 

+/* q_flags bits inherited from ctladdr */
+#define QINHERITEDBITS (QPINGONSUCCESS|QPINGONFAILURE|QPINGONDELAY|QHASNOTIFY)
+
+int

 ADDRESS *
 sendto(list, copyf, ctladdr, qflags)
        char *list;
        ADDRESS *ctladdr;
        ADDRESS **sendq;
 ADDRESS *
 sendto(list, copyf, ctladdr, qflags)
        char *list;
        ADDRESS *ctladdr;
        ADDRESS **sendq;

+       int aliaslevel;

        register ENVELOPE *e;
        u_short qflags;
 {
        register ENVELOPE *e;
        u_short qflags;
 {


@@ -58,7 +65,10 @@ sendto(list, copyf, ctladdr, qflags)
        bool firstone;          /* set on first address sent */
        char delimiter;         /* the address delimiter */
        int naddrs;
        bool firstone;          /* set on first address sent */
        char delimiter;         /* the address delimiter */
        int naddrs;

+       int i;

        char *oldto = e->e_to;
        char *oldto = e->e_to;

+       char *bufp;
+       char buf[MAXNAME + 1];

        ADDRESS *sibl;          /* sibling pointer in tree */
        ADDRESS *prev;          /* previous sibling */
 
        ADDRESS *sibl;          /* sibling pointer in tree */
        ADDRESS *prev;          /* previous sibling */
 


@@ -87,7 +97,15 @@ sendto(list, copyf, ctladdr, qflags)
        al = NULL;
        naddrs = 0;
 
        al = NULL;
        naddrs = 0;
 

-       for (p = list; *p != '\0'; )
+       /* make sure we have enough space to copy the string */
+       i = strlen(list) + 1;
+       if (i <= sizeof buf)
+               bufp = buf;
+       else
+               bufp = xalloc(i);
+       strcpy(bufp, denlstring(list, FALSE, TRUE));
+
+       for (p = bufp; *p != '\0'; )

        {
                auto char *delimptr;
                register ADDRESS *a;
        {
                auto char *delimptr;
                register ADDRESS *a;


@@ -105,27 +123,6 @@ sendto(list, copyf, ctladdr, qflags)
                        a->q_flags |= ctladdr->q_flags & ~QPRIMARY;
                a->q_flags |= qflags;
 
                        a->q_flags |= ctladdr->q_flags & ~QPRIMARY;
                a->q_flags |= qflags;
 

-               /* see if this should be marked as a primary address */
-               if (ctladdr == NULL ||
-                   (firstone && *p == '\0' && bitset(QPRIMARY, ctladdr->q_flags)))
-                       a->q_flags |= QPRIMARY;
-
-               if (ctladdr != NULL && sameaddr(ctladdr, a))
-                       ctladdr->q_flags |= QSELFREF;
-               al = a;
-               firstone = FALSE;
-       }
-
-       /* arrange to send to everyone on the local send list */
-       prev = sibl = NULL;
-       if (ctladdr != NULL)
-               prev = ctladdr->q_child;
-       while (al != NULL)
-       {
-               register ADDRESS *a = al;
-               extern ADDRESS *recipient();
-
-               al = a->q_next;

                sibl = recipient(a);
                if (sibl != NULL)
                {
                sibl = recipient(a);
                if (sibl != NULL)
                {


@@ -145,6 +142,8 @@ sendto(list, copyf, ctladdr, qflags)
        }
 
        e->e_to = oldto;
        }
 
        e->e_to = oldto;

+       if (bufp != buf)
+               free(bufp);

        return (naddrs);
        if (ctladdr != NULL)
                ctladdr->q_child = prev;
        return (naddrs);
        if (ctladdr != NULL)
                ctladdr->q_child = prev;


@@ -194,6 +193,7 @@ addrref(a, r)
 **             sendq -- a pointer to the head of a queue to put the
 **                     recipient in.  Duplicate supression is done
 **                     in this queue.
 **             sendq -- a pointer to the head of a queue to put the
 **                     recipient in.  Duplicate supression is done
 **                     in this queue.

+**             aliaslevel -- the current alias nesting depth.

 **             e -- the current envelope.
 **
 **     Returns:
 **             e -- the current envelope.
 **
 **     Returns:


@@ -205,9 +205,10 @@ addrref(a, r)
 
 ADDRESS *
 ADDRESS *
 
 ADDRESS *
 ADDRESS *

-recipient(a, sendq, e)
+recipient(a, sendq, aliaslevel, e)

        register ADDRESS *a;
        register ADDRESS **sendq;
        register ADDRESS *a;
        register ADDRESS **sendq;

+       int aliaslevel;

        register ENVELOPE *e;
 {
        register ADDRESS *q;
        register ENVELOPE *e;
 {
        register ADDRESS *q;


@@ -216,15 +217,20 @@ recipient(a, sendq, e)
        register char *p;
        bool quoted = FALSE;            /* set if the addr has a quote bit */
        int findusercount = 0;
        register char *p;
        bool quoted = FALSE;            /* set if the addr has a quote bit */
        int findusercount = 0;

-       char buf[MAXNAME];              /* unquoted image of the user name */
+       bool initialdontsend = bitset(QDONTSEND, a->q_flags);
+       int i;
+       char *buf;
+       char buf0[MAXNAME + 1];         /* unquoted image of the user name */

        extern int safefile();
 
        e->e_to = a->q_paddr;
        m = a->q_mailer;
        errno = 0;
        extern int safefile();
 
        e->e_to = a->q_paddr;
        m = a->q_mailer;
        errno = 0;

+       if (aliaslevel == 0)
+               a->q_flags |= QPRIMARY;

        if (tTd(26, 1))
        {
        if (tTd(26, 1))
        {

-               printf("\nrecipient: ");
+               printf("\nrecipient (%d): ", aliaslevel);

                printaddr(a, FALSE);
        }
 
                printaddr(a, FALSE);
        }
 


@@ -238,9 +244,10 @@ recipient(a, sendq, e)
        }
 
        /* break aliasing loops */
        }
 
        /* break aliasing loops */

-       if (AliasLevel > MAXRCRSN)
+       if (aliaslevel > MAXRCRSN)

        {
        {

-               usrerr("554 aliasing/forwarding loop broken");
+               usrerr("554 aliasing/forwarding loop broken (%d aliases deep; %d max",
+                       aliaslevel, MAXRCRSN);

                return (NULL);
        }
 
                return (NULL);
        }
 


@@ -248,10 +255,12 @@ recipient(a, sendq, e)
        **  Finish setting up address structure.
        */
 
        **  Finish setting up address structure.
        */
 

-       /* set the queue timeout */
-       a->q_timeout = TimeOuts.to_q_return;
-

        /* get unquoted user for file, program or user.name check */
        /* get unquoted user for file, program or user.name check */

+       i = strlen(a->q_user);
+       if (i >= sizeof buf0)
+               buf = xalloc(i + 1);
+       else
+               buf = buf0;

        (void) strcpy(buf, a->q_user);
        for (p = buf; *p != '\0' && !quoted; p++)
        {
        (void) strcpy(buf, a->q_user);
        for (p = buf; *p != '\0' && !quoted; p++)
        {


@@ -304,14 +313,14 @@ recipient(a, sendq, e)
                                printf("%s in sendq: ", a->q_paddr);
                                printaddr(q, FALSE);
                        }
                                printf("%s in sendq: ", a->q_paddr);
                                printaddr(q, FALSE);
                        }

-                       if (!bitset(QPRIMARY, q->q_flags) ||
-                           bitset(QSELFREF, q->q_flags))
+                       if (!bitset(QPRIMARY, q->q_flags))

                        {
                        {

-                               if (!bitset(QDONTSEND, a->q_flags) &&
-                                   !bitset(QSELFREF, q->q_flags))
+                               if (!bitset(QDONTSEND, a->q_flags))

                                        message("duplicate suppressed");
                                q->q_flags |= a->q_flags;
                        }
                                        message("duplicate suppressed");
                                q->q_flags |= a->q_flags;
                        }

+                       else if (bitset(QSELFREF, q->q_flags))
+                               q->q_flags |= a->q_flags & ~QDONTSEND;

                        if (!bitset(QPSEUDO, a->q_flags))
                                q->q_flags &= ~QPSEUDO;
                        return (q);
                        if (!bitset(QPSEUDO, a->q_flags))
                                q->q_flags &= ~QPSEUDO;
                        return (q);


@@ -351,13 +360,14 @@ recipient(a, sendq, e)
                        int ret;
 
                        message("including file %s", a->q_user);
                        int ret;
 
                        message("including file %s", a->q_user);

-                       ret = include(a->q_user, FALSE, a, sendq, e);
+                       ret = include(a->q_user, FALSE, a, sendq, aliaslevel, e);

                        if (transienterror(ret))
                        {
 #ifdef LOG
                                if (LogLevel > 2)
                        if (transienterror(ret))
                        {
 #ifdef LOG
                                if (LogLevel > 2)

-                                       syslog(LOG_ERR, "%s: include %s: transient error: %e",
-                                               e->e_id, a->q_user, errstring(ret));
+                                       syslog(LOG_ERR, "%s: include %s: transient error: %s",
+                                               e->e_id == NULL ? "NOQUEUE" : e->e_id,
+                                               a->q_user, errstring(ret));

 #endif
                                a->q_flags |= QQUEUEUP;
                                a->q_flags &= ~QDONTSEND;
 #endif
                                a->q_flags |= QQUEUEUP;
                                a->q_flags &= ~QDONTSEND;


@@ -394,30 +404,26 @@ recipient(a, sendq, e)
                        usrerr("550 Address %s is unsafe for mailing to files",
                                a->q_alias->q_paddr);
                }
                        usrerr("550 Address %s is unsafe for mailing to files",
                                a->q_alias->q_paddr);
                }

-               else if (!writable(buf, getctladdr(a), SFF_ANYFILE))
+               else if (!writable(buf, getctladdr(a), SFF_CREAT))

                {
                        a->q_flags |= QBADADDR;
                {
                        a->q_flags |= QBADADDR;

-                       giveresponse(EX_CANTCREAT, m, NULL, a->q_alias, e);
+                       giveresponse(EX_CANTCREAT, m, NULL, a->q_alias,
+                                    (time_t) 0, e);

                }
        }
 
                }
        }
 

-       if (m != LocalMailer)
-       {
-               if (!bitset(QDONTSEND, a->q_flags))
-                       e->e_nrcpts++;
-               goto testselfdestruct;
-       }
-

        /* try aliasing */
        /* try aliasing */

-       alias(a, sendq, e);
+       if (!bitset(QDONTSEND, a->q_flags) && bitnset(M_ALIASABLE, m->m_flags))
+               alias(a, sendq, aliaslevel, e);

 
 # ifdef USERDB
        /* if not aliased, look it up in the user database */
 
 # ifdef USERDB
        /* if not aliased, look it up in the user database */

-       if (!bitset(QDONTSEND|QNOTREMOTE|QVERIFIED, a->q_flags))
+       if (!bitset(QDONTSEND|QNOTREMOTE|QVERIFIED, a->q_flags) &&
+           bitnset(M_CHECKUDB, m->m_flags))

        {
                extern int udbexpand();
 
        {
                extern int udbexpand();
 

-               if (udbexpand(a, sendq, e) == EX_TEMPFAIL)
+               if (udbexpand(a, sendq, aliaslevel, e) == EX_TEMPFAIL)

                {
                        a->q_flags |= QQUEUEUP;
                        if (e->e_message == NULL)
                {
                        a->q_flags |= QQUEUEUP;
                        if (e->e_message == NULL)


@@ -425,7 +431,8 @@ recipient(a, sendq, e)
 # ifdef LOG
                        if (LogLevel > 8)
                                syslog(LOG_INFO, "%s: deferred: udbexpand: %s",
 # ifdef LOG
                        if (LogLevel > 8)
                                syslog(LOG_INFO, "%s: deferred: udbexpand: %s",

-                                       e->e_id, errstring(errno));
+                                       e->e_id == NULL ? "NOQUEUE" : e->e_id,
+                                       errstring(errno));

 # endif
                        message("queued (user database error): %s",
                                errstring(errno));
 # endif
                        message("queued (user database error): %s",
                                errstring(errno));


@@ -435,10 +442,6 @@ recipient(a, sendq, e)
        }
 # endif
 
        }
 # endif
 

-       /* if it was an alias or a UDB expansion, just return now */
-       if (bitset(QDONTSEND|QQUEUEUP|QVERIFIED, a->q_flags))
-               goto testselfdestruct;
-

        /*
        **  If we have a level two config file, then pass the name through
        **  Ruleset 5 before sending it off.  Ruleset 5 has the right
        /*
        **  If we have a level two config file, then pass the name through
        **  Ruleset 5 before sending it off.  Ruleset 5 has the right


@@ -452,10 +455,11 @@ recipient(a, sendq, e)
                        ConfigLevel, RewriteRules[5]);
                printaddr(a, FALSE);
        }
                        ConfigLevel, RewriteRules[5]);
                printaddr(a, FALSE);
        }

-       if (!bitset(QNOTREMOTE, a->q_flags) && ConfigLevel >= 2 &&
-           RewriteRules[5] != NULL)
+       if (!bitset(QNOTREMOTE|QDONTSEND|QQUEUEUP|QVERIFIED, a->q_flags) &&
+           ConfigLevel >= 2 && RewriteRules[5] != NULL &&
+           bitnset(M_TRYRULESET5, m->m_flags))

        {
        {

-               maplocaluser(a, sendq, e);
+               maplocaluser(a, sendq, aliaslevel + 1, e);

        }
 
        /*
        }
 
        /*


@@ -463,7 +467,8 @@ recipient(a, sendq, e)
        **  and deliver it.
        */
 
        **  and deliver it.
        */
 

-       if (!bitset(QDONTSEND|QQUEUEUP, a->q_flags))
+       if (!bitset(QDONTSEND|QQUEUEUP|QVERIFIED, a->q_flags) &&
+           bitnset(M_HASPWENT, m->m_flags))

        {
                auto bool fuzzy;
                register struct passwd *pw;
        {
                auto bool fuzzy;
                register struct passwd *pw;


@@ -474,11 +479,12 @@ recipient(a, sendq, e)
                if (pw == NULL)
                {
                        a->q_flags |= QBADADDR;
                if (pw == NULL)
                {
                        a->q_flags |= QBADADDR;

-                       giveresponse(EX_NOUSER, m, NULL, a->q_alias, e);
+                       giveresponse(EX_NOUSER, m, NULL, a->q_alias,
+                                    (time_t) 0, e);

                }
                else
                {
                }
                else
                {

-                       char nbuf[MAXNAME];
+                       char nbuf[MAXNAME + 1];

 
                        if (fuzzy)
                        {
 
                        if (fuzzy)
                        {


@@ -489,14 +495,17 @@ recipient(a, sendq, e)
                                        a->q_flags |= QBADADDR;
                                        usrerr("554 aliasing/forwarding loop for %s broken",
                                                pw->pw_name);
                                        a->q_flags |= QBADADDR;
                                        usrerr("554 aliasing/forwarding loop for %s broken",
                                                pw->pw_name);

-                                       return (a);
+                                       goto done;

                                }
 
                                /* see if it aliases */
                                (void) strcpy(buf, pw->pw_name);
                                goto trylocaluser;
                        }
                                }
 
                                /* see if it aliases */
                                (void) strcpy(buf, pw->pw_name);
                                goto trylocaluser;
                        }

-                       a->q_home = newstr(pw->pw_dir);
+                       if (strcmp(pw->pw_dir, "/") == 0)
+                               a->q_home = "";
+                       else
+                               a->q_home = newstr(pw->pw_dir);

                        a->q_uid = pw->pw_uid;
                        a->q_gid = pw->pw_gid;
                        a->q_ruser = newstr(pw->pw_name);
                        a->q_uid = pw->pw_uid;
                        a->q_gid = pw->pw_gid;
                        a->q_ruser = newstr(pw->pw_name);


@@ -510,30 +519,83 @@ recipient(a, sendq, e)
                                a->q_flags |= QBOGUSSHELL;
                        }
                        if (!quoted)
                                a->q_flags |= QBOGUSSHELL;
                        }
                        if (!quoted)

-                               forward(a, sendq, e);
+                               forward(a, sendq, aliaslevel, e);

                }
        }
        if (!bitset(QDONTSEND, a->q_flags))
                e->e_nrcpts++;
 
   testselfdestruct:
                }
        }
        if (!bitset(QDONTSEND, a->q_flags))
                e->e_nrcpts++;
 
   testselfdestruct:

+       a->q_flags |= QTHISPASS;

        if (tTd(26, 8))
        {
                printf("testselfdestruct: ");
        if (tTd(26, 8))
        {
                printf("testselfdestruct: ");

-               printaddr(a, TRUE);
+               printaddr(a, FALSE);
+               if (tTd(26, 10))
+               {
+                       printf("SENDQ:\n");
+                       printaddr(*sendq, TRUE);
+                       printf("----\n");
+               }

        }
        if (a->q_alias == NULL && a != &e->e_from &&
            bitset(QDONTSEND, a->q_flags))
        {
        }
        if (a->q_alias == NULL && a != &e->e_from &&
            bitset(QDONTSEND, a->q_flags))
        {

-               q = *sendq;
-               while (q != NULL && bitset(QDONTSEND, q->q_flags))
-                       q = q->q_next;
+               for (q = *sendq; q != NULL; q = q->q_next)
+               {
+                       if (!bitset(QDONTSEND|QBADADDR, q->q_flags) &&
+                           bitset(QTHISPASS, q->q_flags))
+                               break;
+               }

                if (q == NULL)
                {
                        a->q_flags |= QBADADDR;
                        usrerr("554 aliasing/forwarding loop broken");
                }
        }
                if (q == NULL)
                {
                        a->q_flags |= QBADADDR;
                        usrerr("554 aliasing/forwarding loop broken");
                }
        }

+
+  done:
+       a->q_flags |= QTHISPASS;
+       if (buf != buf0)
+               free(buf);
+
+       /*
+       **  If we are at the top level, check to see if this has
+       **  expanded to exactly one address.  If so, it can inherit
+       **  the primaryness of the address.
+       **
+       **  While we're at it, clear the QTHISPASS bits.
+       */
+
+       if (aliaslevel == 0)
+       {
+               int nrcpts = 0;
+               ADDRESS *only;
+
+               for (q = *sendq; q != NULL; q = q->q_next)
+               {
+                       if (bitset(QTHISPASS, q->q_flags) &&
+                           !bitset(QDONTSEND|QBADADDR, q->q_flags))
+                       {
+                               nrcpts++;
+                               only = q;
+                       }
+                       q->q_flags &= ~QTHISPASS;
+               }
+               if (nrcpts == 1)
+                       only->q_flags |= QPRIMARY;
+               else if (!initialdontsend)
+               {
+                       /* arrange for return receipt */
+                       e->e_flags |= EF_SENDRECEIPT;
+                       a->q_flags |= QEXPLODED;
+                       if (e->e_xfp != NULL)
+                               fprintf(e->e_xfp,
+                                       "%s... expanded to multiple addresses\n",
+                                       a->q_paddr);
+               }
+       }
+

        return (a);
 
        return (a);
        return (a);
 
        return (a);


@@ -576,6 +638,7 @@ finduser(name, fuzzyp)
 
        *fuzzyp = FALSE;
 
 
        *fuzzyp = FALSE;
 

+#ifdef HESIOD

        /* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
        for (p = name; *p != '\0'; p++)
                if (!isascii(*p) || !isdigit(*p))
        /* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
        for (p = name; *p != '\0'; p++)
                if (!isascii(*p) || !isdigit(*p))


@@ -586,6 +649,7 @@ finduser(name, fuzzyp)
                        printf("failed (numeric input)\n");
                return NULL;
        }
                        printf("failed (numeric input)\n");
                return NULL;
        }

+#endif

 
        /* look up this login name using fast path */
        if ((pw = getpwnam(name)) != NULL)
 
        /* look up this login name using fast path */
        if ((pw = getpwnam(name)) != NULL)


@@ -668,33 +732,10 @@ writable(filename, ctladdr, flags)
        int bits;
        register char *p;
        char *uname;
        int bits;
        register char *p;
        char *uname;

-       struct stat stb;
-       extern char RealUserName[];

 
        if (tTd(29, 5))
                printf("writable(%s, %x)\n", filename, flags);
 
 
        if (tTd(29, 5))
                printf("writable(%s, %x)\n", filename, flags);
 

-#ifdef HASLSTAT
-       if ((bitset(SFF_NOSLINK, flags) ? lstat(filename, &stb)
-                                       : stat(filename, &stb)) < 0)
-#else
-       if (stat(filename, &stb) < 0)
-#endif
-       {
-               /* file does not exist -- see if directory is safe */
-               p = strrchr(filename, '/');
-               if (p == NULL)
-               {
-                       errno = ENOTDIR;
-                       return FALSE;
-               }
-               *p = '\0';
-               errno = safefile(filename, RealUid, RealGid, RealUserName,
-                                SFF_MUSTOWN, S_IWRITE|S_IEXEC);
-               *p = '/';
-               return errno == 0;
-       }
-

 #ifdef SUID_ROOT_FILES_OK
        /* really ought to be passed down -- and not a good idea */
        flags |= SFF_ROOTOK;
 #ifdef SUID_ROOT_FILES_OK
        /* really ought to be passed down -- and not a good idea */
        flags |= SFF_ROOTOK;


@@ -704,26 +745,32 @@ writable(filename, ctladdr, flags)
        **  File does exist -- check that it is writable.
        */
 
        **  File does exist -- check that it is writable.
        */
 

-       if (bitset(0111, stb.st_mode))
-       {
-               if (tTd(29, 5))
-                       printf("failed (mode %o: x bits)\n", stb.st_mode);
-               errno = EPERM;
-               return (FALSE);
-       }
-

        if (ctladdr != NULL && geteuid() == 0)
        {
                euid = ctladdr->q_uid;
                egid = ctladdr->q_gid;
                uname = ctladdr->q_user;
        }
        if (ctladdr != NULL && geteuid() == 0)
        {
                euid = ctladdr->q_uid;
                egid = ctladdr->q_gid;
                uname = ctladdr->q_user;
        }

+#ifdef RUN_AS_REAL_UID

        else
        {
        else
        {

+               extern char RealUserName[];
+

                euid = RealUid;
                egid = RealGid;
                uname = RealUserName;
        }
                euid = RealUid;
                egid = RealGid;
                uname = RealUserName;
        }

+#else
+       else if (FileMailer != NULL)
+       {
+               euid = FileMailer->m_uid;
+               egid = FileMailer->m_gid;
+       }
+       else
+       {
+               euid = egid = 0;
+       }
+#endif

        if (euid == 0)
        {
                euid = DefUid;
        if (euid == 0)
        {
                euid = DefUid;


@@ -732,23 +779,9 @@ writable(filename, ctladdr, flags)
        if (egid == 0)
                egid = DefGid;
        if (geteuid() == 0)
        if (egid == 0)
                egid = DefGid;
        if (geteuid() == 0)

-       {
-               if (bitset(S_ISUID, stb.st_mode) &&
-                   (stb.st_uid != 0 || bitset(SFF_ROOTOK, flags)))
-               {
-                       euid = stb.st_uid;
-                       uname = NULL;
-               }
-               if (bitset(S_ISGID, stb.st_mode) &&
-                   (stb.st_gid != 0 || bitset(SFF_ROOTOK, flags)))
-                       egid = stb.st_gid;
-       }
+               flags |= SFF_SETUIDOK;

 
 

-       if (tTd(29, 5))
-               printf("\teu/gid=%d/%d, st_u/gid=%d/%d\n",
-                       euid, egid, stb.st_uid, stb.st_gid);
-
-       errno = safefile(filename, euid, egid, uname, flags, S_IWRITE);
+       errno = safefile(filename, euid, egid, uname, flags, S_IWRITE, NULL);

        return errno == 0;
 }
 \f/*
        return errno == 0;
 }
 \f/*


@@ -763,6 +796,8 @@ writable(filename, ctladdr, flags)
 **                     the important things.
 **             sendq -- a pointer to the head of the send queue
 **                     to put these addresses in.
 **                     the important things.
 **             sendq -- a pointer to the head of the send queue
 **                     to put these addresses in.

+**             aliaslevel -- the alias nesting depth.
+**             e -- the current envelope.

 **
 **     Returns:
 **             open error status
 **
 **     Returns:
 **             open error status


@@ -770,24 +805,34 @@ writable(filename, ctladdr, flags)
 **     Side Effects:
 **             reads the :include: file and sends to everyone
 **             listed in that file.
 **     Side Effects:
 **             reads the :include: file and sends to everyone
 **             listed in that file.

+**
+**     Security Note:
+**             If you have restricted chown (that is, you can't
+**             give a file away), it is reasonable to allow programs
+**             and files called from this :include: file to be to be
+**             run as the owner of the :include: file.  This is bogus
+**             if there is any chance of someone giving away a file.
+**             We assume that pre-POSIX systems can give away files.
+**
+**             There is an additional restriction that if you
+**             forward to a :include: file, it will not take on
+**             the ownership of the :include: file.  This may not
+**             be necessary, but shouldn't hurt.

 */
 
 static jmp_buf CtxIncludeTimeout;
 */
 
 static jmp_buf CtxIncludeTimeout;

-static int     includetimeout();
-
-#ifndef S_IWOTH
-# define S_IWOTH       (S_IWRITE >> 6)
-#endif
+static void    includetimeout();

 
 int
 
 int

-include(fname, forwarding, ctladdr, sendq, e)
+include(fname, forwarding, ctladdr, sendq, aliaslevel, e)

        char *fname;
        bool forwarding;
        ADDRESS *ctladdr;
        ADDRESS **sendq;
        char *fname;
        bool forwarding;
        ADDRESS *ctladdr;
        ADDRESS **sendq;

+       int aliaslevel;

        ENVELOPE *e;
 {
        ENVELOPE *e;
 {

-       register FILE *fp = NULL;
+       FILE *fp = NULL;

        char *oldto = e->e_to;
        char *oldfilename = FileName;
        int oldlinenumber = LineNumber;
        char *oldto = e->e_to;
        char *oldfilename = FileName;
        int oldlinenumber = LineNumber;


@@ -798,9 +843,27 @@ include(fname, forwarding, ctladdr, sendq, e)
        gid_t savedgid, gid;
        char *uname;
        int rval = 0;
        gid_t savedgid, gid;
        char *uname;
        int rval = 0;

-       int sfflags = forwarding ? SFF_MUSTOWN : SFF_ANYFILE;
+       int sfflags = SFF_REGONLY;

        struct stat st;
        char buf[MAXLINE];
        struct stat st;
        char buf[MAXLINE];

+#ifdef _POSIX_CHOWN_RESTRICTED
+# if _POSIX_CHOWN_RESTRICTED == -1
+#  define safechown    FALSE
+# else
+#  define safechown    TRUE
+# endif
+#else
+# ifdef _PC_CHOWN_RESTRICTED
+       bool safechown;
+# else
+#  ifdef BSD
+#   define safechown   TRUE
+#  else
+#   define safechown   FALSE
+#  endif
+# endif
+#endif
+       extern bool chownsafe();

 
        if (tTd(27, 2))
                printf("include(%s)\n", fname);
 
        if (tTd(27, 2))
                printf("include(%s)\n", fname);


@@ -815,30 +878,38 @@ include(fname, forwarding, ctladdr, sendq, e)
        if (tTd(27, 9))
                printf("include: old uid = %d/%d\n", getuid(), geteuid());
 
        if (tTd(27, 9))
                printf("include: old uid = %d/%d\n", getuid(), geteuid());
 

+       if (forwarding)
+               sfflags |= SFF_MUSTOWN;
+

        ca = getctladdr(ctladdr);
        if (ca == NULL)
        {
                uid = DefUid;
                gid = DefGid;
                uname = DefUser;
        ca = getctladdr(ctladdr);
        if (ca == NULL)
        {
                uid = DefUid;
                gid = DefGid;
                uname = DefUser;

-               saveduid = -1;

        }
        else
        {
                uid = ca->q_uid;
                gid = ca->q_gid;
                uname = ca->q_user;
        }
        else
        {
                uid = ca->q_uid;
                gid = ca->q_gid;
                uname = ca->q_user;

+       }

 #ifdef HASSETREUID
 #ifdef HASSETREUID

-               saveduid = geteuid();
-               savedgid = getegid();
-               if (saveduid == 0)
+       saveduid = geteuid();
+       savedgid = getegid();
+       if (saveduid == 0)
+       {
+               initgroups(uname, gid);
+               if (uid != 0)

                {
                {

-                       initgroups(uname, gid);
-                       if (uid != 0)
-                               (void) setreuid(0, uid);
+                       if (setreuid(0, uid) < 0)
+                               syserr("setreuid(0, %d) failure (real=%d, eff=%d)",
+                                       uid, getuid(), geteuid());
+                       else
+                               sfflags |= SFF_NOPATHCHECK;

                }
                }

-#endif                   

        }
        }

+#endif                   

 
        if (tTd(27, 9))
                printf("include: new uid = %d/%d\n", getuid(), geteuid());
 
        if (tTd(27, 9))
                printf("include: new uid = %d/%d\n", getuid(), geteuid());


@@ -852,16 +923,18 @@ include(fname, forwarding, ctladdr, sendq, e)
        {
                ctladdr->q_flags |= QQUEUEUP;
                errno = 0;
        {
                ctladdr->q_flags |= QQUEUEUP;
                errno = 0;

-               usrerr("451 open timeout on %s", fname);

 
                /* return pseudo-error code */
                rval = EOPENTIMEOUT;
                goto resetuid;
        }
 
                /* return pseudo-error code */
                rval = EOPENTIMEOUT;
                goto resetuid;
        }

-       ev = setevent((time_t) 60, includetimeout, 0);
+       if (TimeOuts.to_fileopen > 0)
+               ev = setevent(TimeOuts.to_fileopen, includetimeout, 0);
+       else
+               ev = NULL;

 
        /* the input file must be marked safe */
 
        /* the input file must be marked safe */

-       rval = safefile(fname, uid, gid, uname, sfflags, S_IREAD);
+       rval = safefile(fname, uid, gid, uname, sfflags, S_IREAD, NULL);

        if (rval != 0)
        {
                /* don't use this :include: file */
        if (rval != 0)
        {
                /* don't use this :include: file */


@@ -879,7 +952,8 @@ include(fname, forwarding, ctladdr, sendq, e)
                                printf("include: open: %s\n", errstring(rval));
                }
        }
                                printf("include: open: %s\n", errstring(rval));
                }
        }

-       clrevent(ev);
+       if (ev != NULL)
+               clrevent(ev);

 
 resetuid:
 
 
 resetuid:
 


@@ -887,9 +961,14 @@ resetuid:
        if (saveduid == 0)
        {
                if (uid != 0)
        if (saveduid == 0)
        {
                if (uid != 0)

-                       if (setreuid(-1, 0) < 0 || setreuid(RealUid, 0) < 0)
+               {
+                       if (setreuid(-1, 0) < 0)
+                               syserr("setreuid(-1, 0) failure (real=%d, eff=%d)",
+                                       getuid(), geteuid());
+                       if (setreuid(RealUid, 0) < 0)

                                syserr("setreuid(%d, 0) failure (real=%d, eff=%d)",
                                        RealUid, getuid(), geteuid());
                                syserr("setreuid(%d, 0) failure (real=%d, eff=%d)",
                                        RealUid, getuid(), geteuid());

+               }

                setgid(savedgid);
        }
 #endif
                setgid(savedgid);
        }
 #endif


@@ -897,6 +976,9 @@ resetuid:
        if (tTd(27, 9))
                printf("include: reset uid = %d/%d\n", getuid(), geteuid());
 
        if (tTd(27, 9))
                printf("include: reset uid = %d/%d\n", getuid(), geteuid());
 

+       if (rval == EOPENTIMEOUT)
+               usrerr("451 open timeout on %s", fname);
+

        if (fp == NULL)
                return rval;
 
        if (fp == NULL)
                return rval;
 


@@ -907,7 +989,10 @@ resetuid:
                return rval;
        }
 
                return rval;
        }
 

-       if (ca == NULL)
+#ifndef safechown
+       safechown = chownsafe(fileno(fp));
+#endif
+       if (ca == NULL && safechown)

        {
                ctladdr->q_uid = st.st_uid;
                ctladdr->q_gid = st.st_gid;
        {
                ctladdr->q_uid = st.st_uid;
                ctladdr->q_gid = st.st_gid;


@@ -924,10 +1009,24 @@ resetuid:
                register struct passwd *pw;
 
                pw = getpwuid(st.st_uid);
                register struct passwd *pw;
 
                pw = getpwuid(st.st_uid);

-               if (pw == NULL || !usershellok(pw->pw_shell))
+               if (pw == NULL)
+                       ctladdr->q_flags |= QBOGUSSHELL;
+               else

                {
                {

+                       char *sh;
+

                        ctladdr->q_ruser = newstr(pw->pw_name);
                        ctladdr->q_ruser = newstr(pw->pw_name);

-                       ctladdr->q_flags |= QBOGUSSHELL;
+                       if (safechown)
+                               sh = pw->pw_shell;
+                       else
+                               sh = "/SENDMAIL/ANY/SHELL/";
+                       if (!usershellok(sh))
+                       {
+                               if (safechown)
+                                       ctladdr->q_flags |= QBOGUSSHELL;
+                               else
+                                       ctladdr->q_flags |= QUNSAFEADDR;
+                       }

                }
        }
 
                }
        }
 


@@ -973,12 +1072,11 @@ resetuid:
 #ifdef LOG
                if (forwarding && LogLevel > 9)
                        syslog(LOG_INFO, "%s: forward %s => %s",
 #ifdef LOG
                if (forwarding && LogLevel > 9)
                        syslog(LOG_INFO, "%s: forward %s => %s",

-                               e->e_id, oldto, buf);
+                               e->e_id == NULL ? "NOQUEUE" : e->e_id,
+                               oldto, buf);

 #endif
 
 #endif
 

-               AliasLevel++;
-               sendto(buf, 1, ctladdr, 0);
-               AliasLevel--;
+               nincludes += sendtolist(buf, ctladdr, sendq, aliaslevel + 1, e);

        }
 
        if (ferror(fp) && tTd(27, 3))
        }
 
        if (ferror(fp) && tTd(27, 3))


@@ -1000,7 +1098,7 @@ resetuid:
        return rval;
 }
 
        return rval;
 }
 

-static
+static void

 includetimeout()
 {
        longjmp(CtxIncludeTimeout, 1);
 includetimeout()
 {
        longjmp(CtxIncludeTimeout, 1);