move entry/exit debugging to 21.1

[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 9d79d81..f0416b9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

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


@@ -42,14 +42,8 @@ char *DelimChar;             /* set to point to the delimiter */
 **             addr -- the address to parse.
 **             a -- a pointer to the address descriptor buffer.
 **                     If NULL, a header will be created.
 **             addr -- the address to parse.
 **             a -- a pointer to the address descriptor buffer.
 **                     If NULL, a header will be created.

-**             copyf -- determines what shall be copied:
-**                     -1 -- don't copy anything.  The printname
-**                             (q_paddr) is just addr, and the
-**                             user & host are allocated internally
-**                             to parse.
-**                     0 -- copy out the parsed user & host, but
-**                             don't copy the printname.
-**                     +1 -- copy everything.
+**             flags -- describe detail for parsing.  See RF_ definitions
+**                     in sendmail.h.

 **             delim -- the character to terminate the address, passed
 **                     to prescan.
 **             delimptr -- if non-NULL, set to the location of the
 **             delim -- the character to terminate the address, passed
 **                     to prescan.
 **             delimptr -- if non-NULL, set to the location of the


@@ -69,10 +63,10 @@ char        *DelimChar;             /* set to point to the delimiter */
 # define DELIMCHARS    "()<>,;\r\n"    /* default word delimiters */
 
 ADDRESS *
 # define DELIMCHARS    "()<>,;\r\n"    /* default word delimiters */
 
 ADDRESS *

-parseaddr(addr, a, copyf, delim, delimptr, e)
+parseaddr(addr, a, flags, delim, delimptr, e)

        char *addr;
        register ADDRESS *a;
        char *addr;
        register ADDRESS *a;

-       int copyf;
+       int flags;

        int delim;
        char **delimptr;
        register ENVELOPE *e;
        int delim;
        char **delimptr;
        register ENVELOPE *e;


@@ -90,13 +84,6 @@ parseaddr(addr, a, copyf, delim, delimptr, e)
        if (tTd(20, 1))
                printf("\n--parseaddr(%s)\n", addr);
 
        if (tTd(20, 1))
                printf("\n--parseaddr(%s)\n", addr);
 

-       if (invalidaddr(addr))
-       {
-               if (tTd(20, 1))
-                       printf("parseaddr-->bad address\n");
-               return NULL;
-       }
-

        {
                extern char *DelimChar;         /* parseaddr.c */
                char savec;
        {
                extern char *DelimChar;         /* parseaddr.c */
                char savec;


@@ -116,7 +103,7 @@ parseaddr(addr, a, copyf, delim, delimptr, e)
        if (delimptr == NULL)
                delimptr = &delimptrbuf;
 
        if (delimptr == NULL)
                delimptr = &delimptrbuf;
 

-       pvp = prescan(addr, delim, pvpbuf, delimptr);
+       pvp = prescan(addr, delim, pvpbuf, sizeof pvpbuf, delimptr);

        if (pvp == NULL)
        {
                if (tTd(20, 1))
        if (pvp == NULL)
        {
                if (tTd(20, 1))


@@ -124,42 +111,58 @@ parseaddr(addr, a, copyf, delim, delimptr, e)
                return (NULL);
        }
 
                return (NULL);
        }
 

+       if (invalidaddr(addr, delim == '\0' ? NULL : *delimptr))
+       {
+               if (tTd(20, 1))
+                       printf("parseaddr-->bad address\n");
+               return NULL;
+       }
+
+       /*
+       **  Save addr if we are going to have to.
+       **
+       **      We have to do this early because there is a chance that
+       **      the map lookups in the rewriting rules could clobber
+       **      static memory somewhere.
+       */
+
+       if (bitset(RF_COPYPADDR, flags) && addr != NULL)
+       {
+               char savec = **delimptr;
+
+               if (savec != '\0')
+                       **delimptr = '\0';
+               e->e_to = addr = newstr(addr);
+               if (savec != '\0')
+                       **delimptr = savec;
+       }
+

        /*
        **  Apply rewriting rules.
        **      Ruleset 0 does basic parsing.  It must resolve.
        */
 
        queueup = FALSE;
        /*
        **  Apply rewriting rules.
        **      Ruleset 0 does basic parsing.  It must resolve.
        */
 
        queueup = FALSE;

-       if (rewrite(pvp, 3, e) == EX_TEMPFAIL)
+       if (rewrite(pvp, 3, 0, e) == EX_TEMPFAIL)

                queueup = TRUE;
                queueup = TRUE;

-       if (rewrite(pvp, 0, e) == EX_TEMPFAIL)
+       if (rewrite(pvp, 0, 0, e) == EX_TEMPFAIL)

                queueup = TRUE;
 
                queueup = TRUE;
 

-       /*
-       **  See if we resolved to a real mailer.
-       */
-
-       if (pvp[0] == NULL || (pvp[0][0] & 0377) != CANONNET)
-       {
-               setstat(EX_USAGE);
-               syserr("554 cannot resolve name %s", addr);
-               return (NULL);
-       }

 
        /*
        **  Build canonical address from pvp.
        */
 
 
        /*
        **  Build canonical address from pvp.
        */
 

-       a = buildaddr(pvp, a, e);
-       if (a == NULL)
-               return (NULL);
+       a = buildaddr(pvp, a, flags, e);

 
        /*
        **  Make local copies of the host & user and then
        **  transport them out.
        */
 
 
        /*
        **  Make local copies of the host & user and then
        **  transport them out.
        */
 

-       allocaddr(a, copyf, addr, *delimptr);
+       allocaddr(a, flags, addr);
+       if (bitset(QBADADDR, a->q_flags))
+               return a;

 
        /*
        **  If there was a parsing failure, mark it for queueing.
 
        /*
        **  If there was a parsing failure, mark it for queueing.


@@ -201,18 +204,43 @@ parseaddr(addr, a, copyf, delim, delimptr, e)
 */
 
 bool
 */
 
 bool

-invalidaddr(addr)
+invalidaddr(addr, delimptr)

        register char *addr;
        register char *addr;

+       char *delimptr;

 {
 {

+       char savedelim;
+
+       if (delimptr != NULL)
+       {
+               savedelim = *delimptr;
+               if (savedelim != '\0')
+                       *delimptr = '\0';
+       }
+#if 0
+       /* for testing.... */
+       if (strcmp(addr, "INvalidADDR") == 0)
+       {
+               usrerr("553 INvalid ADDRess");
+               goto addrfailure;
+       }
+#endif

        for (; *addr != '\0'; addr++)
        {
        for (; *addr != '\0'; addr++)
        {

-               if ((*addr & 0340) != 0200)
-                       continue;
-               setstat(EX_USAGE);
-               usrerr("553 Address contained invalid control characters");
-               return TRUE;
+               if ((*addr & 0340) == 0200)
+                       break;
+       }
+       if (*addr == '\0')
+       {
+               if (savedelim != '\0' && delimptr != NULL)
+                       *delimptr = savedelim;
+               return FALSE;

        }
        }

-       return FALSE;
+       setstat(EX_USAGE);
+       usrerr("553 Address contained invalid control characters");
+  addrfailure:
+       if (savedelim != '\0' && delimptr != NULL)
+               *delimptr = savedelim;
+       return TRUE;

 }
 \f/*
 **  ALLOCADDR -- do local allocations of address on demand.
 }
 \f/*
 **  ALLOCADDR -- do local allocations of address on demand.


@@ -221,9 +249,9 @@ invalidaddr(addr)
 **
 **     Parameters:
 **             a -- the address to reallocate.
 **
 **     Parameters:
 **             a -- the address to reallocate.

-**             copyf -- the copy flag (see parseaddr for description).
+**             flags -- the copy flag (see RF_ definitions in sendmail.h
+**                     for a description).

 **             paddr -- the printname of the address.
 **             paddr -- the printname of the address.

-**             delimptr -- a pointer to the address delimiter.  Must be set.

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


@@ -232,34 +260,22 @@ invalidaddr(addr)
 **             Copies portions of a into local buffers as requested.
 */
 
 **             Copies portions of a into local buffers as requested.
 */
 

-allocaddr(a, copyf, paddr, delimptr)
+allocaddr(a, flags, paddr)

        register ADDRESS *a;
        register ADDRESS *a;

-       int copyf;
+       int flags;

        char *paddr;
        char *paddr;

-       char *delimptr;

 {
        if (tTd(24, 4))
 {
        if (tTd(24, 4))

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

 
 

-       if (copyf > 0 && paddr != NULL)
-       {
-               char savec = *delimptr;
-
-               if (savec != '\0')
-                       *delimptr = '\0';
-               a->q_paddr = newstr(paddr);
-               if (savec != '\0')
-                       *delimptr = savec;
-       }
-       else
-               a->q_paddr = paddr;
+       a->q_paddr = paddr;

 
        if (a->q_user == NULL)
                a->q_user = "";
        if (a->q_host == NULL)
                a->q_host = "";
 
 
        if (a->q_user == NULL)
                a->q_user = "";
        if (a->q_host == NULL)
                a->q_host = "";
 

-       if (copyf >= 0)
+       if (bitset(RF_COPYPARSE, flags))

        {
                a->q_host = newstr(a->q_host);
                if (a->q_user != a->q_paddr)
        {
                a->q_host = newstr(a->q_host);
                if (a->q_user != a->q_paddr)


@@ -331,6 +347,7 @@ invalidaddr(addr)
 **                     If '\t' then we are reading the .cf file.
 **             pvpbuf -- place to put the saved text -- note that
 **                     the pointers are static.
 **                     If '\t' then we are reading the .cf file.
 **             pvpbuf -- place to put the saved text -- note that
 **                     the pointers are static.

+**             pvpbsize -- size of pvpbuf.

 **             delimptr -- if non-NULL, set to the location of the
 **                     terminating delimiter.
 **
 **             delimptr -- if non-NULL, set to the location of the
 **                     terminating delimiter.
 **


@@ -364,10 +381,34 @@ static short StateTab[NSTATES][NSTATES] =
        /*ONE*/         OPR,    OPR,    OPR,    OPR,    OPR,
 };
 
        /*ONE*/         OPR,    OPR,    OPR,    OPR,    OPR,
 };
 

+/* token type table -- it gets modified with $o characters */
+static TokTypeTab[256] =
+{
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,SPC,SPC,SPC,SPC,SPC,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       SPC,ATM,QST,ATM,ATM,ATM,ATM,ATM,ATM,SPC,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       OPR,OPR,ONE,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,
+       OPR,OPR,OPR,ONE,ONE,ONE,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+       ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+};
+
+#define toktype(c)     ((int) TokTypeTab[(c) & 0xff])
+
+

 # define NOCHAR                -1      /* signal nothing in lookahead token */
 
 char **
 # define NOCHAR                -1      /* signal nothing in lookahead token */
 
 char **

-prescan(addr, delim, pvpbuf, delimptr)
+prescan(addr, delim, pvpbuf, pvpbsize, delimptr)

        char *addr;
        char delim;
        char pvpbuf[];
        char *addr;
        char delim;
        char pvpbuf[];


@@ -385,6 +426,22 @@ prescan(addr, delim, pvpbuf, delimptr)
        int newstate;
        char *saveto = CurEnv->e_to;
        static char *av[MAXATOM+1];
        int newstate;
        char *saveto = CurEnv->e_to;
        static char *av[MAXATOM+1];

+       static char firsttime = TRUE;
+
+       if (firsttime)
+       {
+               /* initialize the token type table */
+               char obuf[50];
+
+               firsttime = FALSE;
+               expand("\201o", obuf, &obuf[sizeof obuf - sizeof DELIMCHARS], CurEnv);
+               strcat(obuf, DELIMCHARS);
+               for (p = obuf; *p != '\0'; p++)
+               {
+                       if (TokTypeTab[*p & 0xff] == ATM)
+                               TokTypeTab[*p & 0xff] = OPR;
+               }
+       }

 
        /* make sure error messages don't have garbage on them */
        errno = 0;
 
        /* make sure error messages don't have garbage on them */
        errno = 0;


@@ -415,9 +472,10 @@ prescan(addr, delim, pvpbuf, delimptr)
                        if (c != NOCHAR && !bslashmode)
                        {
                                /* see if there is room */
                        if (c != NOCHAR && !bslashmode)
                        {
                                /* see if there is room */

-                               if (q >= &pvpbuf[PSBUFSIZE - 5])
+                               if (q >= &pvpbuf[pvpbsize - 5])

                                {
                                        usrerr("553 Address too long");
                                {
                                        usrerr("553 Address too long");

+       returnnull:

                                        if (delimptr != NULL)
                                                *delimptr = p;
                                        CurEnv->e_to = saveto;
                                        if (delimptr != NULL)
                                                *delimptr = p;
                                        CurEnv->e_to = saveto;


@@ -435,18 +493,18 @@ prescan(addr, delim, pvpbuf, delimptr)
                                /* diagnose and patch up bad syntax */
                                if (state == QST)
                                {
                                /* diagnose and patch up bad syntax */
                                if (state == QST)
                                {

-                                       usrerr("553 Unbalanced '\"'");
+                                       usrerr("653 Unbalanced '\"'");

                                        c = '"';
                                }
                                else if (cmntcnt > 0)
                                {
                                        c = '"';
                                }
                                else if (cmntcnt > 0)
                                {

-                                       usrerr("553 Unbalanced '('");
+                                       usrerr("653 Unbalanced '('");

                                        c = ')';
                                }
                                else if (anglecnt > 0)
                                {
                                        c = '>';
                                        c = ')';
                                }
                                else if (anglecnt > 0)
                                {
                                        c = '>';

-                                       usrerr("553 Unbalanced '<'");
+                                       usrerr("653 Unbalanced '<'");

                                }
                                else
                                        break;
                                }
                                else
                                        break;


@@ -496,11 +554,8 @@ prescan(addr, delim, pvpbuf, delimptr)
                        {
                                if (cmntcnt <= 0)
                                {
                        {
                                if (cmntcnt <= 0)
                                {

-                                       usrerr("553 Unbalanced ')'");
-                                       if (delimptr != NULL)
-                                               *delimptr = p;
-                                       CurEnv->e_to = saveto;
-                                       return (NULL);
+                                       usrerr("653 Unbalanced ')'");
+                                       c = NOCHAR;

                                }
                                else
                                        cmntcnt--;
                                }
                                else
                                        cmntcnt--;


@@ -513,13 +568,11 @@ prescan(addr, delim, pvpbuf, delimptr)
                        {
                                if (anglecnt <= 0)
                                {
                        {
                                if (anglecnt <= 0)
                                {

-                                       usrerr("553 Unbalanced '>'");
-                                       if (delimptr != NULL)
-                                               *delimptr = p;
-                                       CurEnv->e_to = saveto;
-                                       return (NULL);
+                                       usrerr("653 Unbalanced '>'");
+                                       c = NOCHAR;

                                }
                                }

-                               anglecnt--;
+                               else
+                                       anglecnt--;

                        }
                        else if (delim == ' ' && isascii(c) && isspace(c))
                                c = ' ';
                        }
                        else if (delim == ' ' && isascii(c) && isspace(c))
                                c = ' ';


@@ -568,10 +621,12 @@ prescan(addr, delim, pvpbuf, delimptr)
                        if (avp >= &av[MAXATOM])
                        {
                                syserr("553 prescan: too many tokens");
                        if (avp >= &av[MAXATOM])
                        {
                                syserr("553 prescan: too many tokens");

-                               if (delimptr != NULL)
-                                       *delimptr = p;
-                               CurEnv->e_to = saveto;
-                               return (NULL);
+                               goto returnnull;
+                       }
+                       if (q - tok > MAXNAME)
+                       {
+                               syserr("553 prescan: token too long");
+                               goto returnnull;

                        }
                        *avp++ = tok;
                }
                        }
                        *avp++ = tok;
                }


@@ -587,55 +642,12 @@ prescan(addr, delim, pvpbuf, delimptr)
        }
        CurEnv->e_to = saveto;
        if (av[0] == NULL)
        }
        CurEnv->e_to = saveto;
        if (av[0] == NULL)

-               return (NULL);
-       return (av);
-}
-\f/*
-**  TOKTYPE -- return token type
-**
-**     Parameters:
-**             c -- the character in question.
-**
-**     Returns:
-**             Its type.
-**
-**     Side Effects:
-**             none.
-*/
-
-static int
-toktype(c)
-       register int c;
-{
-       static char buf[50];
-       static bool firstime = TRUE;
-
-       if (firstime)

        {
        {

-               firstime = FALSE;
-               expand("\201o", buf, &buf[sizeof buf - 1], CurEnv);
-               (void) strcat(buf, DELIMCHARS);
+               if (tTd(22, 1))
+                       printf("prescan: null leading token\n");
+               return (NULL);

        }
        }

-       c &= 0377;
-       if (c == MATCHCLASS || c == MATCHREPL || c == MATCHNCLASS)
-               return (ONE);
-       if (c == MACRODEXPAND)
-               return (ONE);
-#ifdef MACVALUE
-       if (c == MACVALUE)
-               return (ONE);
-#endif /* MACVALUE */
-       if (c == '"')
-               return (QST);
-       if ((c & 0340) == 0200)
-               return (OPR);
-       if (!isascii(c))
-               return (ATM);
-       if (isspace(c) || c == ')')
-               return (SPC);
-       if (strchr(buf, c) != NULL)
-               return (OPR);
-       return (ATM);
+       return (av);

 }
 \f/*
 **  REWRITE -- apply rewrite rules to token vector.
 }
 \f/*
 **  REWRITE -- apply rewrite rules to token vector.


@@ -662,6 +674,7 @@ toktype(c)
 **     Parameters:
 **             pvp -- pointer to token vector.
 **             ruleset -- the ruleset to use for rewriting.
 **     Parameters:
 **             pvp -- pointer to token vector.
 **             ruleset -- the ruleset to use for rewriting.

+**             reclevel -- recursion level (to catch loops).

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


@@ -689,8 +702,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,


@@ -706,9 +723,10 @@ static char control_init_data[] = {
 static int nrw;
 
 void
 static int nrw;
 
 void

-rewrite(pvp, ruleset, e)
+rewrite(pvp, ruleset, reclevel, e)

        char **pvp;
        int ruleset;
        char **pvp;
        int ruleset;

+       int reclevel;

        register ENVELOPE *e;
 {
        nrw = 0;
        register ENVELOPE *e;
 {
        nrw = 0;


@@ -728,6 +746,7 @@ _rewrite(pvp, ruleset)
        register struct rewrite *rwr;   /* pointer to current rewrite rule */
        int ruleno;                     /* current rule number */
        int rstat = EX_OK;              /* return status */
        register struct rewrite *rwr;   /* pointer to current rewrite rule */
        int ruleno;                     /* current rule number */
        int rstat = EX_OK;              /* return status */

+       int loopcount;

        int subr;                       /* subroutine number if >= 0 */
        bool dolookup;                  /* do host aliasing */
        char *npvp[MAXATOM+1];          /* temporary space for rebuild */
        int subr;                       /* subroutine number if >= 0 */
        bool dolookup;                  /* do host aliasing */
        char *npvp[MAXATOM+1];          /* temporary space for rebuild */


@@ -738,7 +757,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);


@@ -748,6 +767,11 @@ _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++ > MAXRULERECURSION)
+       {
+               syserr("rewrite: infinite recursion, ruleset %d", ruleset);
+               return EX_CONFIG;
+       }

        if (pvp == NULL)
                return EX_USAGE;
 
        if (pvp == NULL)
                return EX_USAGE;
 


@@ -770,10 +794,9 @@ _rewrite(pvp, ruleset)
        */
 
        ruleno = 1;
        */
 
        ruleno = 1;

+       loopcount = 0;

        for (rwr = RewriteRules[ruleset]; rwr != NULL; )
        {
        for (rwr = RewriteRules[ruleset]; rwr != NULL; )
        {

-               int loopcount = 0;
-

                if (tTd(21, 12))
                {
                        printf("-----trying rule:");
                if (tTd(21, 12))
                {
                        printf("-----trying rule:");


@@ -1161,6 +1184,7 @@ backup:
                                printf("----- rule fails\n");
                        rwr = rwr->r_next;
                        ruleno++;
                                printf("----- rule fails\n");
                        rwr = rwr->r_next;
                        ruleno++;

+                       loopcount = 0;

                        nmatches = 0;
                        continue;
                }
                        nmatches = 0;
                        continue;
                }


@@ -1187,6 +1211,7 @@ backup:
                        rvp++;
                        rwr = rwr->r_next;
                        ruleno++;
                        rvp++;
                        rwr = rwr->r_next;
                        ruleno++;

+                       loopcount = 0;

                        nmatches = 0;
                }
                else if ((*rp & 0377) == CANONHOST)
                        nmatches = 0;
                }
                else if ((*rp & 0377) == CANONHOST)


@@ -1285,6 +1310,7 @@ backup:
                        char *pvpb1[MAXATOM + 1];
                        char *argvect[10];
                        char pvpbuf[PSBUFSIZE];
                        char *pvpb1[MAXATOM + 1];
                        char *argvect[10];
                        char pvpbuf[PSBUFSIZE];

+                       char *nullpvp[1];

                        bool match, defaultpart;
                        char begintype;
                        char db = '\0';
                        bool match, defaultpart;
                        char begintype;
                        char db = '\0';


@@ -1445,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);


@@ -1508,6 +1534,8 @@ callsubr(pvp)
 **             tv -- token vector.
 **             a -- pointer to address descriptor to fill.
 **                     If NULL, one will be allocated.
 **             tv -- token vector.
 **             a -- pointer to address descriptor to fill.
 **                     If NULL, one will be allocated.

+**             flags -- info regarding whether this is a sender or
+**                     a recipient.

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


@@ -1538,17 +1566,26 @@ struct errcodes
 };
 
 static ADDRESS *
 };
 
 static ADDRESS *

-buildaddr(tv, a, e)
+buildaddr(tv, a, flags, e)

        register char **tv;
        register ADDRESS *a;
        register char **tv;
        register ADDRESS *a;

+       int flags;

        register ENVELOPE *e;
 {
        struct mailer **mp;
        register struct mailer *m;
        char *bp;
        int spaceleft;
        register ENVELOPE *e;
 {
        struct mailer **mp;
        register struct mailer *m;
        char *bp;
        int spaceleft;

+       static MAILER errormailer;
+       static char *errorargv[] = { "ERROR", NULL };

        static char buf[MAXNAME];
 
        static char buf[MAXNAME];
 

+       if (tTd(24, 5))
+       {
+               printf("buildaddr, flags=%o, tv=", flags);
+               printav(tv);
+       }
+

        if (a == NULL)
                a = (ADDRESS *) xalloc(sizeof *a);
        clear((char *) a, sizeof *a);
        if (a == NULL)
                a = (ADDRESS *) xalloc(sizeof *a);
        clear((char *) a, sizeof *a);


@@ -1557,7 +1594,17 @@ buildaddr(tv, a, e)
        if (*tv == NULL || **tv != CANONNET)
        {
                syserr("554 buildaddr: no net");
        if (*tv == NULL || **tv != CANONNET)
        {
                syserr("554 buildaddr: no net");

-               return (NULL);
+badaddr:
+               a->q_flags |= QBADADDR;
+               a->q_mailer = &errormailer;
+               if (errormailer.m_name == NULL)
+               {
+                       /* initialize the bogus mailer */
+                       errormailer.m_name = "*error*";
+                       errormailer.m_mailer = "ERROR";
+                       errormailer.m_argv = errorargv;
+               }
+               return a;

        }
        tv++;
        if (strcasecmp(*tv, "error") == 0)
        }
        tv++;
        if (strcasecmp(*tv, "error") == 0)


@@ -1579,6 +1626,8 @@ buildaddr(tv, a, e)
                        }
                        tv++;
                }
                        }
                        tv++;
                }

+               else
+                       setstat(EX_UNAVAILABLE);

                buf[0] = '\0';
                for (; (*tv != NULL) && (**tv != CANONUSER); tv++)
                {
                buf[0] = '\0';
                for (; (*tv != NULL) && (**tv != CANONUSER); tv++)
                {


@@ -1595,8 +1644,22 @@ buildaddr(tv, a, e)
                        syslog (LOG_DEBUG, "%s: Trace: $#ERROR $: %s",
                                CurEnv->e_id, buf);
 #endif /* LOG */
                        syslog (LOG_DEBUG, "%s: Trace: $#ERROR $: %s",
                                CurEnv->e_id, buf);
 #endif /* LOG */

-               usrerr(buf);
-               return (NULL);
+               if (isascii(buf[0]) && isdigit(buf[0]) &&
+                   isascii(buf[1]) && isdigit(buf[1]) &&
+                   isascii(buf[2]) && isdigit(buf[2]) &&
+                   buf[3] == ' ')
+               {
+                       char fmt[10];
+
+                       strncpy(fmt, buf, 3);
+                       strcpy(&fmt[3], " %s");
+                       usrerr(fmt, buf + 4);
+               }
+               else
+               {
+                       usrerr("553 %s", buf);
+               }
+               goto badaddr;

        }
 
        for (mp = Mailer; (m = *mp++) != NULL; )
        }
 
        for (mp = Mailer; (m = *mp++) != NULL; )


@@ -1607,7 +1670,7 @@ buildaddr(tv, a, e)
        if (m == NULL)
        {
                syserr("554 buildaddr: unknown mailer %s", *tv);
        if (m == NULL)
        {
                syserr("554 buildaddr: unknown mailer %s", *tv);

-               return (NULL);
+               goto badaddr;

        }
        a->q_mailer = m;
 
        }
        a->q_mailer = m;
 


@@ -1632,7 +1695,7 @@ buildaddr(tv, a, e)
        if (*tv == NULL || (**tv & 0377) != CANONUSER)
        {
                syserr("554 buildaddr: no user");
        if (*tv == NULL || (**tv & 0377) != CANONUSER)
        {
                syserr("554 buildaddr: no user");

-               return (NULL);
+               goto badaddr;

        }
        tv++;
 
        }
        tv++;
 


@@ -1670,7 +1733,7 @@ buildaddr(tv, a, e)
 
        if (m->m_r_rwset > 0)
                rewrite(tv, m->m_r_rwset);
 
        if (m->m_r_rwset > 0)
                rewrite(tv, m->m_r_rwset);

-       (void) rewrite(tv, 4, e);
+       (void) rewrite(tv, 4, 0, e);

 
        /* save the result for the command line/RCPT argument */
        cataddr(tv, NULL, buf, sizeof buf, '\0');
 
        /* save the result for the command line/RCPT argument */
        cataddr(tv, NULL, buf, sizeof buf, '\0');


@@ -1765,6 +1828,8 @@ sameaddr(a, b)
        register ADDRESS *a;
        register ADDRESS *b;
 {
        register ADDRESS *a;
        register ADDRESS *b;
 {

+       register ADDRESS *ca, *cb;
+

        /* if they don't have the same mailer, forget it */
        if (a->q_mailer != b->q_mailer)
                return (FALSE);
        /* if they don't have the same mailer, forget it */
        if (a->q_mailer != b->q_mailer)
                return (FALSE);


@@ -1773,9 +1838,16 @@ sameaddr(a, b)
        if (strcasecmp(a->q_user, b->q_user))
                return (FALSE);
 
        if (strcasecmp(a->q_user, b->q_user))
                return (FALSE);
 

-       /* if we have good uids for both but the differ, these are different */
-       if (bitset(QGOODUID, a->q_flags & b->q_flags) && a->q_uid != b->q_uid)
-               return (FALSE);
+       /* if we have good uids for both but they differ, these are different */
+       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)


@@ -1919,10 +1991,10 @@ remotename(name, m, flags, pstat, e)
        **      domain will be appended.
        */
 
        **      domain will be appended.
        */
 

-       pvp = prescan(name, '\0', pvpbuf, NULL);
+       pvp = prescan(name, '\0', pvpbuf, sizeof pvpbuf, NULL);

        if (pvp == NULL)
                return (name);
        if (pvp == NULL)
                return (name);

-       if (rewrite(pvp, 3, e) == EX_TEMPFAIL)
+       if (rewrite(pvp, 3, 0, e) == EX_TEMPFAIL)

                *pstat = EX_TEMPFAIL;
        if (bitset(RF_ADDDOMAIN, flags) && e->e_fromdomain != NULL)
        {
                *pstat = EX_TEMPFAIL;
        if (bitset(RF_ADDDOMAIN, flags) && e->e_fromdomain != NULL)
        {


@@ -1939,7 +2011,7 @@ remotename(name, m, flags, pstat, e)
 
                        while ((*pxp++ = *qxq++) != NULL)
                                continue;
 
                        while ((*pxp++ = *qxq++) != NULL)
                                continue;

-                       if (rewrite(pvp, 3, e) == EX_TEMPFAIL)
+                       if (rewrite(pvp, 3, 0, e) == EX_TEMPFAIL)

                                *pstat = EX_TEMPFAIL;
                }
        }
                                *pstat = EX_TEMPFAIL;
                }
        }


@@ -1956,7 +2028,7 @@ remotename(name, m, flags, pstat, e)
        {
        if (rwset > 0)
        {
        {
        if (rwset > 0)
        {

-               if (rewrite(pvp, rwset, e) == EX_TEMPFAIL)
+               if (rewrite(pvp, rwset, 0, e) == EX_TEMPFAIL)

                        *pstat = EX_TEMPFAIL;
        }
 
                        *pstat = EX_TEMPFAIL;
        }
 


@@ -1967,7 +2039,7 @@ remotename(name, m, flags, pstat, e)
        **      may be used as a default to the above rules.
        */
 
        **      may be used as a default to the above rules.
        */
 

-       if (rewrite(pvp, 4, e) == EX_TEMPFAIL)
+       if (rewrite(pvp, 4, 0, e) == EX_TEMPFAIL)

                *pstat = EX_TEMPFAIL;
 
        /*
                *pstat = EX_TEMPFAIL;
 
        /*


@@ -1976,7 +2048,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, &buf[sizeof buf - 1], e);
+       else
+               expand(fancy, buf, &buf[sizeof buf - 1], e);
+

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


@@ -2080,16 +2158,16 @@ maplocaluser(a, sendq, e)
                printf("maplocaluser: ");
                printaddr(a, FALSE);
        }
                printf("maplocaluser: ");
                printaddr(a, FALSE);
        }

-       pvp = prescan(a->q_user, '\0', pvpbuf, &delimptr);
+       pvp = prescan(a->q_user, '\0', pvpbuf, sizeof pvpbuf, &delimptr);

        if (pvp == NULL)
                return;
 
        if (pvp == NULL)
                return;
 

-       (void) rewrite(pvp, 5, e);
+       (void) rewrite(pvp, 5, 0, e);

        if (pvp[0] == NULL || (pvp[0][0] & 0377) != CANONNET)
                return;
 
        /* if non-null, mailer destination specified -- has it changed? */
        if (pvp[0] == NULL || (pvp[0][0] & 0377) != CANONNET)
                return;
 
        /* if non-null, mailer destination specified -- has it changed? */

-       a1 = buildaddr(pvp, NULL, e);
+       a1 = buildaddr(pvp, NULL, 0, e);

        if (a1 == NULL || sameaddr(a, a1))
                return;
 
        if (a1 == NULL || sameaddr(a, a1))
                return;
 


@@ -2101,7 +2179,7 @@ maplocaluser(a, sendq, e)
                printaddr(a, FALSE);
        }
        a1->q_alias = a;
                printaddr(a, FALSE);
        }
        a1->q_alias = a;

-       allocaddr(a1, 1, NULL, delimptr);
+       allocaddr(a1, RF_COPYALL, NULL);

        (void) recipient(a1, sendq, e);
 }
 \f/*
        (void) recipient(a1, sendq, e);
 }
 \f/*