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 5ca02df..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.58 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        8.75 (Berkeley) %G%";

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


@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)recipient.c       8.58 (Berkeley) %G%";
 #define MAXRCRSN       10      /* maximum levels of alias recursion */
 
 /* q_flags bits inherited from ctladdr */
 #define MAXRCRSN       10      /* maximum levels of alias recursion */
 
 /* q_flags bits inherited from ctladdr */

-#define QINHERITEDBITS (QPINGONSUCCESS|QPINGONFAILURE|QPINGONDELAY|QHAS_RET_PARAM|QRET_HDRS)
+#define QINHERITEDBITS (QPINGONSUCCESS|QPINGONFAILURE|QPINGONDELAY|QHASNOTIFY)

 
 int
 ADDRESS *
 
 int
 ADDRESS *


@@ -65,9 +65,9 @@ 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;

-       static char *bufp = NULL;
-       static int buflen;
+       char *bufp;

        char buf[MAXNAME + 1];
        ADDRESS *sibl;          /* sibling pointer in tree */
        ADDRESS *prev;          /* previous sibling */
        char buf[MAXNAME + 1];
        ADDRESS *sibl;          /* sibling pointer in tree */
        ADDRESS *prev;          /* previous sibling */


@@ -97,20 +97,13 @@ sendto(list, copyf, ctladdr, qflags)
        al = NULL;
        naddrs = 0;
 
        al = NULL;
        naddrs = 0;
 

-       if (buf == NULL)
-       {
+       /* make sure we have enough space to copy the string */
+       i = strlen(list) + 1;
+       if (i <= sizeof buf)

                bufp = buf;
                bufp = buf;

-               buflen = sizeof buf - 1;
-       }
-       if (strlen(list) > buflen)
-       {
-               /* allocate additional space */
-               if (bufp != buf)
-                       free(bufp);
-               buflen = strlen(list);
-               bufp = malloc(buflen + 1);
-       }
-       strcpy(bufp, list);
+       else
+               bufp = xalloc(i);
+       strcpy(bufp, denlstring(list, FALSE, TRUE));

 
        for (p = bufp; *p != '\0'; )
        {
 
        for (p = bufp; *p != '\0'; )
        {


@@ -130,11 +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;
-

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


@@ -154,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;


@@ -227,17 +217,20 @@ recipient(a, sendq, aliaslevel, 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;

+       bool initialdontsend = bitset(QDONTSEND, a->q_flags);

        int i;
        char *buf;
        int i;
        char *buf;

-       char buf0[MAXNAME];             /* unquoted image of the user name */
+       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);
        }
 


@@ -264,7 +257,7 @@ recipient(a, sendq, aliaslevel, e)
 
        /* get unquoted user for file, program or user.name check */
        i = strlen(a->q_user);
 
        /* get unquoted user for file, program or user.name check */
        i = strlen(a->q_user);

-       if (i >= sizeof buf)
+       if (i >= sizeof buf0)

                buf = xalloc(i + 1);
        else
                buf = buf0;
                buf = xalloc(i + 1);
        else
                buf = buf0;


@@ -411,10 +404,11 @@ recipient(a, sendq, aliaslevel, 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);

                }
        }
 
                }
        }
 


@@ -465,7 +459,7 @@ recipient(a, sendq, aliaslevel, e)
            ConfigLevel >= 2 && RewriteRules[5] != NULL &&
            bitnset(M_TRYRULESET5, m->m_flags))
        {
            ConfigLevel >= 2 && RewriteRules[5] != NULL &&
            bitnset(M_TRYRULESET5, m->m_flags))
        {

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

        }
 
        /*
        }
 
        /*


@@ -485,11 +479,12 @@ recipient(a, sendq, aliaslevel, 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)
                        {


@@ -531,17 +526,27 @@ recipient(a, sendq, aliaslevel, e)
                e->e_nrcpts++;
 
   testselfdestruct:
                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;
                if (q == NULL)
                {
                        a->q_flags |= QBADADDR;


@@ -550,8 +555,47 @@ recipient(a, sendq, aliaslevel, e)
        }
 
   done:
        }
 
   done:

+       a->q_flags |= QTHISPASS;

        if (buf != buf0)
                free(buf);
        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);


@@ -688,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;


@@ -724,14 +745,6 @@ 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;
        if (ctladdr != NULL && geteuid() == 0)
        {
                euid = ctladdr->q_uid;


@@ -741,6 +754,8 @@ writable(filename, ctladdr, flags)
 #ifdef RUN_AS_REAL_UID
        else
        {
 #ifdef RUN_AS_REAL_UID
        else
        {

+               extern char RealUserName[];
+

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


@@ -764,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/*


@@ -820,11 +821,7 @@ writable(filename, ctladdr, flags)
 */
 
 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
 include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 
 int
 include(fname, forwarding, ctladdr, sendq, aliaslevel, e)


@@ -835,7 +832,7 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
        int aliaslevel;
        ENVELOPE *e;
 {
        int aliaslevel;
        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;


@@ -846,7 +843,7 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, 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];
 #ifdef _POSIX_CHOWN_RESTRICTED
        struct stat st;
        char buf[MAXLINE];
 #ifdef _POSIX_CHOWN_RESTRICTED


@@ -881,34 +878,38 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, 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)
-                       {
-                               if (setreuid(0, uid) < 0)
-                                       syserr("setreuid(0, %d) failure (real=%d, eff=%d)",
-                                               uid, getuid(), geteuid());
-                       }
+                       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());


@@ -933,7 +934,7 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
                ev = NULL;
 
        /* the input file must be marked safe */
                ev = NULL;
 
        /* 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 */


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

-static
+static void

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