more cleanup for DSN drafts

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

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 59c25f8..7bbd518 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -7,11 +7,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)parseaddr.c        8.25 (Berkeley) %G%";
+static char sccsid[] = "@(#)parseaddr.c        8.61 (Berkeley) %G%";

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

+static int     callsubr __P((char **, int, ENVELOPE *));
+

 #ifdef CC_WONT_PROMOTE
 static int toktype __P((char));
 #else  /* !CC_WONT_PROMOTE */
 #ifdef CC_WONT_PROMOTE
 static int toktype __P((char));
 #else  /* !CC_WONT_PROMOTE */


@@ -132,7 +134,7 @@ parseaddr(addr, a, flags, delim, delimptr, e)
 
                if (savec != '\0')
                        **delimptr = '\0';
 
                if (savec != '\0')
                        **delimptr = '\0';

-               addr = newstr(addr);
+               e->e_to = addr = newstr(addr);

                if (savec != '\0')
                        **delimptr = savec;
        }
                if (savec != '\0')
                        **delimptr = savec;
        }


@@ -178,6 +180,7 @@ parseaddr(addr, a, flags, delim, delimptr, e)
                if (e->e_message == NULL)
                        e->e_message = newstr(msg);
                a->q_flags |= QQUEUEUP;
                if (e->e_message == NULL)
                        e->e_message = newstr(msg);
                a->q_flags |= QQUEUEUP;

+               a->q_status = "4.4.3";

        }
 
        /*
        }
 
        /*


@@ -208,7 +211,7 @@ invalidaddr(addr, delimptr)
        register char *addr;
        char *delimptr;
 {
        register char *addr;
        char *delimptr;
 {

-       char savedelim;
+       char savedelim = '\0';

 
        if (delimptr != NULL)
        {
 
        if (delimptr != NULL)
        {


@@ -231,14 +234,14 @@ invalidaddr(addr, delimptr)
        }
        if (*addr == '\0')
        {
        }
        if (*addr == '\0')
        {

-               if (savedelim != '\0' && delimptr != NULL)
+               if (delimptr != NULL && savedelim != '\0')

                        *delimptr = savedelim;
                return FALSE;
        }
        setstat(EX_USAGE);
        usrerr("553 Address contained invalid control characters");
   addrfailure:
                        *delimptr = savedelim;
                return FALSE;
        }
        setstat(EX_USAGE);
        usrerr("553 Address contained invalid control characters");
   addrfailure:

-       if (savedelim != '\0' && delimptr != NULL)
+       if (delimptr != NULL && savedelim != '\0')

                *delimptr = savedelim;
        return TRUE;
 }
                *delimptr = savedelim;
        return TRUE;
 }


@@ -266,7 +269,7 @@ allocaddr(a, flags, paddr)
        char *paddr;
 {
        if (tTd(24, 4))
        char *paddr;
 {
        if (tTd(24, 4))

-               printf("allocaddr(flags=%o, paddr=%s)\n", flags, paddr);
+               printf("allocaddr(flags=%x, paddr=%s)\n", flags, paddr);

 
        a->q_paddr = paddr;
 
 
        a->q_paddr = paddr;
 


@@ -410,7 +413,7 @@ static TokTypeTab[256] =
 char **
 prescan(addr, delim, pvpbuf, pvpbsize, delimptr)
        char *addr;
 char **
 prescan(addr, delim, pvpbuf, pvpbsize, delimptr)
        char *addr;

-       char delim;
+       int delim;

        char pvpbuf[];
        char **delimptr;
 {
        char pvpbuf[];
        char **delimptr;
 {


@@ -434,7 +437,7 @@ prescan(addr, delim, pvpbuf, pvpbsize, delimptr)
                char obuf[50];
 
                firsttime = FALSE;
                char obuf[50];
 
                firsttime = FALSE;

-               expand("\201o", obuf, &obuf[sizeof obuf - sizeof DELIMCHARS], CurEnv);
+               expand("\201o", obuf, sizeof obuf - sizeof DELIMCHARS, CurEnv);

                strcat(obuf, DELIMCHARS);
                for (p = obuf; *p != '\0'; p++)
                {
                strcat(obuf, DELIMCHARS);
                for (p = obuf; *p != '\0'; p++)
                {


@@ -475,6 +478,8 @@ prescan(addr, delim, pvpbuf, pvpbsize, delimptr)
                                if (q >= &pvpbuf[pvpbsize - 5])
                                {
                                        usrerr("553 Address too long");
                                if (q >= &pvpbuf[pvpbsize - 5])
                                {
                                        usrerr("553 Address too long");

+                                       if (strlen(addr) > MAXNAME)
+                                               addr[MAXNAME] = '\0';

        returnnull:
                                        if (delimptr != NULL)
                                                *delimptr = p;
        returnnull:
                                        if (delimptr != NULL)
                                                *delimptr = p;


@@ -702,8 +707,12 @@ struct match
 # define MAXMATCH      9       /* max params per rewrite */
 # define MAX_CONTROL ' '
 
 # define MAXMATCH      9       /* max params per rewrite */
 # define MAX_CONTROL ' '
 

+# ifndef MAXRULERECURSION
+#  define MAXRULERECURSION     50      /* max recursion depth */
+# endif

 static char control_opts[MAX_CONTROL];
 
 static char control_opts[MAX_CONTROL];
 

+

 int
 static char control_init_data[] = { 
        MATCHZANY,      OP_VARLEN,
 int
 static char control_init_data[] = { 
        MATCHZANY,      OP_VARLEN,


@@ -753,7 +762,7 @@ _rewrite(pvp, ruleset)
        struct match *old_mlp;          /* to save our place */
        bool extend_match;      /* extend existing match during backup */
 
        struct match *old_mlp;          /* to save our place */
        bool extend_match;      /* extend existing match during backup */
 

-       if (OpMode == MD_TEST || tTd(21, 2))
+       if (OpMode == MD_TEST || tTd(21, 1))

        {
                printf("rewrite: ruleset %2d   input:", ruleset);
                printcav(pvp);
        {
                printf("rewrite: ruleset %2d   input:", ruleset);
                printcav(pvp);


@@ -763,7 +772,7 @@ _rewrite(pvp, ruleset)
                syserr("554 rewrite: illegal ruleset number %d", ruleset);
                return EX_CONFIG;
        }
                syserr("554 rewrite: illegal ruleset number %d", ruleset);
                return EX_CONFIG;
        }

-       if (reclevel++ > 50)
+       if (reclevel++ > MAXRULERECURSION)

        {
                syserr("rewrite: infinite recursion, ruleset %d", ruleset);
                return EX_CONFIG;
        {
                syserr("rewrite: infinite recursion, ruleset %d", ruleset);
                return EX_CONFIG;


@@ -1426,11 +1435,6 @@ backup:
                **  Then copy vector back into original space.
                */
 
                **  Then copy vector back into original space.
                */
 

-               callsubr(npvp);
-
-               for (avp = npvp; *avp++ != NULL;);
-                       subr = atoi(*++rvp);
-                       rvp++;

 
                else
                        subr = -1;
 
                else
                        subr = -1;


@@ -1467,7 +1471,7 @@ backup:
                }
        }
 
                }
        }
 

-       if (OpMode == MD_TEST || tTd(21, 2))
+       if (OpMode == MD_TEST || tTd(21, 1))

        {
                printf("rewrite: ruleset %2d returns:", ruleset);
                printcav(pvp);
        {
                printf("rewrite: ruleset %2d returns:", ruleset);
                printcav(pvp);


@@ -1488,6 +1492,70 @@ backup:
 **             pvp is modified.
 */
 
 **             pvp is modified.
 */
 

+static int
+callsubr(pvp, reclevel, e)
+       char **pvp;
+       int reclevel;
+       ENVELOPE *e;
+{
+       char **rvp;
+       int subr;
+       int stat;
+       STAB *s;
+
+       for (; *pvp != NULL; pvp++)
+       {
+               if ((**pvp & 0377) == CALLSUBR && pvp[1] != NULL)
+                       break;
+       }
+       if (*pvp == NULL)
+               return EX_OK;
+
+       if (tTd(21, 3))
+               printf("-----callsubr %s\n", pvp[1]);
+
+       s = stab(pvp[1], ST_RULESET, ST_FIND);
+       if (s == NULL)
+               subr = atoi(pvp[1]);
+       else
+               subr = s->s_ruleset;
+
+       /*
+       **  Take care of possible inner calls.
+       */
+
+       stat = callsubr(&pvp[2], reclevel, e);
+       if (stat != EX_OK)
+               return stat;
+
+       /*
+       **  Move vector up over calling opcode.
+       */
+
+       for (rvp = &pvp[2]; *rvp != NULL; rvp++)
+               rvp[-2] = rvp[0];
+       rvp[-2] = NULL;
+
+       /*
+       **  Call inferior ruleset.
+       */
+
+       stat = rewrite(pvp, subr, reclevel, e);
+       return stat;
+}
+\f/*
+**  CALLSUBR -- call subroutines in rewrite vector
+**
+**     Parameters:
+**             pvp -- pointer to token vector.
+**
+**     Returns:
+**             none.
+**
+**     Side Effects:
+**             pvp is modified.
+*/
+

 static void
 callsubr(pvp)
        char **pvp;
 static void
 callsubr(pvp)
        char **pvp;


@@ -1574,11 +1642,11 @@ buildaddr(tv, a, flags, e)
        int spaceleft;
        static MAILER errormailer;
        static char *errorargv[] = { "ERROR", NULL };
        int spaceleft;
        static MAILER errormailer;
        static char *errorargv[] = { "ERROR", NULL };

-       static char buf[MAXNAME];
+       static char buf[MAXNAME + 1];

 
        if (tTd(24, 5))
        {
 
        if (tTd(24, 5))
        {

-               printf("buildaddr, flags=%o, tv=", flags);
+               printf("buildaddr, flags=%x, tv=", flags);

                printav(tv);
        }
 
                printav(tv);
        }
 


@@ -1586,6 +1654,9 @@ buildaddr(tv, a, flags, e)
                a = (ADDRESS *) xalloc(sizeof *a);
        clear((char *) a, sizeof *a);
 
                a = (ADDRESS *) xalloc(sizeof *a);
        clear((char *) a, sizeof *a);
 

+       /* set up default error return flags */
+       a->q_flags |= QPINGONFAILURE|QPINGONDELAY;
+

        /* figure out what net/mailer to use */
        if (*tv == NULL || **tv != CANONNET)
        {
        /* figure out what net/mailer to use */
        if (*tv == NULL || **tv != CANONNET)
        {


@@ -1650,10 +1721,22 @@ badaddr:
                        strncpy(fmt, buf, 3);
                        strcpy(&fmt[3], " %s");
                        usrerr(fmt, buf + 4);
                        strncpy(fmt, buf, 3);
                        strcpy(&fmt[3], " %s");
                        usrerr(fmt, buf + 4);

+
+                       /*
+                       **  If this is a 4xx code and we aren't running
+                       **  SMTP on our input, bounce this message;
+                       **  otherwise it disappears without a trace.
+                       */
+
+                       if (fmt[0] == '4' && OpMode != MD_SMTP &&
+                           OpMode != MD_DAEMON)
+                       {
+                               e->e_flags |= EF_FATALERRS;
+                       }

                }
                else
                {
                }
                else
                {

-                       usrerr("%s", buf);
+                       usrerr("553 %s", buf);

                }
                goto badaddr;
        }
                }
                goto badaddr;
        }


@@ -1695,18 +1778,25 @@ badaddr:
        }
        tv++;
 
        }
        tv++;
 

+       if (bitnset(M_CHECKUDB, m->m_flags) && *tv != NULL &&
+           strcmp(*tv, "@") == 0)
+       {
+               tv++;
+               a->q_flags |= QNOTREMOTE;
+       }
+

        /* do special mapping for local mailer */
        /* do special mapping for local mailer */

-       if (m == LocalMailer && *tv != NULL)
+       if (*tv != NULL)

        {
                register char *p = *tv;
 
                if (*p == '"')
                        p++;
        {
                register char *p = *tv;
 
                if (*p == '"')
                        p++;

-               if (*p == '|')
+               if (*p == '|' && bitnset(M_CHECKPROG, m->m_flags))

                        a->q_mailer = m = ProgMailer;
                        a->q_mailer = m = ProgMailer;

-               else if (*p == '/')
+               else if (*p == '/' && bitnset(M_CHECKFILE, m->m_flags))

                        a->q_mailer = m = FileMailer;
                        a->q_mailer = m = FileMailer;

-               else if (*p == ':')
+               else if (*p == ':' && bitnset(M_CHECKINCLUDE, m->m_flags))

                {
                        /* may be :include: */
                        cataddr(tv, NULL, buf, sizeof buf, '\0');
                {
                        /* may be :include: */
                        cataddr(tv, NULL, buf, sizeof buf, '\0');


@@ -1721,12 +1811,6 @@ badaddr:
                }
        }
 
                }
        }
 

-       if (m == LocalMailer && *tv != NULL && strcmp(*tv, "@") == 0)
-       {
-               tv++;
-               a->q_flags |= QNOTREMOTE;
-       }
-

        if (m->m_r_rwset > 0)
                rewrite(tv, m->m_r_rwset);
        (void) rewrite(tv, 4, 0, e);
        if (m->m_r_rwset > 0)
                rewrite(tv, m->m_r_rwset);
        (void) rewrite(tv, 4, 0, e);


@@ -1835,11 +1919,15 @@ sameaddr(a, b)
                return (FALSE);
 
        /* if we have good uids for both but they differ, these are different */
                return (FALSE);
 
        /* if we have good uids for both but they differ, these are different */

-       ca = getctladdr(a);
-       cb = getctladdr(b);
-       if (bitset(QGOODUID, ca->q_flags & cb->q_flags) &&
-           ca->q_uid != cb->q_uid)
-               return (FALSE);
+       if (a->q_mailer == ProgMailer)
+       {
+               ca = getctladdr(a);
+               cb = getctladdr(b);
+               if (ca != NULL && cb != NULL &&
+                   bitset(QGOODUID, ca->q_flags & cb->q_flags) &&
+                   ca->q_uid != cb->q_uid)
+                       return (FALSE);
+       }

 
        /* otherwise compare hosts (but be careful for NULL ptrs) */
        if (a->q_host == b->q_host)
 
        /* otherwise compare hosts (but be careful for NULL ptrs) */
        if (a->q_host == b->q_host)


@@ -1871,21 +1959,58 @@ sameaddr(a, b)
 **             none.
 */
 
 **             none.
 */
 

+struct qflags
+{
+       char    *qf_name;
+       u_long  qf_bit;
+};
+
+struct qflags  AddressFlags[] =
+{
+       "QDONTSEND",            QDONTSEND,
+       "QBADADDR",             QBADADDR,
+       "QGOODUID",             QGOODUID,
+       "QPRIMARY",             QPRIMARY,
+       "QQUEUEUP",             QQUEUEUP,
+       "QSENT",                QSENT,
+       "QNOTREMOTE",           QNOTREMOTE,
+       "QSELFREF",             QSELFREF,
+       "QVERIFIED",            QVERIFIED,
+       "QREPORT",              QREPORT,
+       "QBOGUSSHELL",          QBOGUSSHELL,
+       "QUNSAFEADDR",          QUNSAFEADDR,
+       "QPINGONSUCCESS",       QPINGONSUCCESS,
+       "QPINGONFAILURE",       QPINGONFAILURE,
+       "QPINGONDELAY",         QPINGONDELAY,
+       "QHASNOTIFY",           QHASNOTIFY,
+       "QRELAYED",             QRELAYED,
+       "QEXPLODED",            QEXPLODED,
+       "QTHISPASS",            QTHISPASS,
+       NULL
+};
+
+void

 void
 printaddr(a, follow)
        register ADDRESS *a;
        bool follow;
 {
 void
 printaddr(a, follow)
        register ADDRESS *a;
        bool follow;
 {

-       bool first = TRUE;

        register MAILER *m;
        MAILER pseudomailer;
        register MAILER *m;
        MAILER pseudomailer;

+       register struct qflags *qfp;
+       bool firstone;
+
+       if (a == NULL)
+       {
+               printf("[NULL]\n");
+               return;
+       }

 
        static int indent;
        register int i;
 
        while (a != NULL)
        {
 
        static int indent;
        register int i;
 
        while (a != NULL)
        {

-               first = FALSE;

                for (i = indent; i > 0; i--)
                        printf("\t");
                printf("%x=", a);
                for (i = indent; i > 0; i--)
                        printf("\t");
                printf("%x=", a);


@@ -1915,10 +2040,25 @@ printaddr(a, follow)
                indent--;
                a = a->q_sibling;
        }
                indent--;
                a = a->q_sibling;
        }

-       if (first)
-               printf("[NULL]\n");

 }
 }

+\f/*
+**  EMPTYADDR -- return TRUE if this address is empty (``<>'')
+**
+**     Parameters:
+**             a -- pointer to the address
+**
+**     Returns:
+**             TRUE -- if this address is "empty" (i.e., no one should
+**                     ever generate replies to it.
+**             FALSE -- if it is a "regular" (read: replyable) address.
+*/

 
 

+bool
+emptyaddr(a)
+       register ADDRESS *a;
+{
+       return strcmp(a->q_paddr, "<>") == 0 || strcmp(a->q_user, "<>") == 0;
+}

 \f/*
 **  REMOTENAME -- return the name relative to the current mailer
 **
 \f/*
 **  REMOTENAME -- return the name relative to the current mailer
 **


@@ -1954,8 +2094,8 @@ remotename(name, m, flags, pstat, e)
        char *fancy;
        char *oldg = macvalue('g', e);
        int rwset;
        char *fancy;
        char *oldg = macvalue('g', e);
        int rwset;

-       static char buf[MAXNAME];
-       char lbuf[MAXNAME];
+       static char buf[MAXNAME + 1];
+       char lbuf[MAXNAME + 1];

        char pvpbuf[PSBUFSIZE];
 
        if (tTd(12, 1))
        char pvpbuf[PSBUFSIZE];
 
        if (tTd(12, 1))


@@ -2040,7 +2180,13 @@ remotename(name, m, flags, pstat, e)
 
        cataddr(pvp, NULL, lbuf, sizeof lbuf, '\0');
        define('g', lbuf, e);
 
        cataddr(pvp, NULL, lbuf, sizeof lbuf, '\0');
        define('g', lbuf, e);

-       expand(fancy, buf, &buf[sizeof buf - 1], e);
+
+       /* need to make sure route-addrs have <angle brackets> */
+       if (bitset(RF_CANONICAL, flags) && lbuf[0] == '@')
+               expand("<\201g>", buf, sizeof buf, e);
+       else
+               expand(fancy, buf, sizeof buf, e);
+

        define('g', oldg, e);
 
        if (tTd(12, 1))
        define('g', oldg, e);
 
        if (tTd(12, 1))


@@ -2124,14 +2270,17 @@ uurelativize(from, to, pvp)
 **             a -- the address to map (but just the user name part).
 **             sendq -- the sendq in which to install any replacement
 **                     addresses.
 **             a -- the address to map (but just the user name part).
 **             sendq -- the sendq in which to install any replacement
 **                     addresses.

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

 **
 **     Returns:
 **             none.
 */
 
 **
 **     Returns:
 **             none.
 */
 

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

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

+       int aliaslevel;

        ENVELOPE *e;
 {
        register char **pvp;
        ENVELOPE *e;
 {
        register char **pvp;


@@ -2166,7 +2315,7 @@ maplocaluser(a, sendq, e)
        }
        a1->q_alias = a;
        allocaddr(a1, RF_COPYALL, NULL);
        }
        a1->q_alias = a;
        allocaddr(a1, RF_COPYALL, NULL);

-       (void) recipient(a1, sendq, e);
+       (void) recipient(a1, sendq, aliaslevel, e);

 }
 \f/*
 **  DEQUOTE_INIT -- initialize dequote map
 }
 \f/*
 **  DEQUOTE_INIT -- initialize dequote map


@@ -2199,6 +2348,10 @@ dequote_init(map, args)
                  case 'a':
                        map->map_app = ++p;
                        break;
                  case 'a':
                        map->map_app = ++p;
                        break;

+
+                 case 's':
+                       map->map_coldelim = *++p;
+                       break;

                }
                while (*p != '\0' && !(isascii(*p) && isspace(*p)))
                        p++;
                }
                while (*p != '\0' && !(isascii(*p) && isspace(*p)))
                        p++;


@@ -2235,19 +2388,13 @@ dequote_map(map, name, av, statp)
        register char *p;
        register char *q;
        register char c;
        register char *p;
        register char *q;
        register char c;

-       int anglecnt;
-       int cmntcnt;
-       int quotecnt;
-       int spacecnt;
-       bool quotemode;
-       bool bslashmode;
-
-       anglecnt = 0;
-       cmntcnt = 0;
-       quotecnt = 0;
-       spacecnt = 0;
-       quotemode = FALSE;
-       bslashmode = FALSE;
+       int anglecnt = 0;
+       int cmntcnt = 0;
+       int quotecnt = 0;
+       int spacecnt = 0;
+       bool quotemode = FALSE;
+       bool bslashmode = FALSE;
+       char spacesub = map->map_coldelim;

 
        for (p = q = name; (c = *p++) != '\0'; )
        {
 
        for (p = q = name; (c = *p++) != '\0'; )
        {


@@ -2258,6 +2405,9 @@ dequote_map(map, name, av, statp)
                        continue;
                }
 
                        continue;
                }
 

+               if (c == ' ' && spacesub != '\0')
+                       c = spacesub;
+

                switch (c)
                {
                  case '\\':
                switch (c)
                {
                  case '\\':