allow $#local $: @ /filename

SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 8.47

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 4b1ad7c..486c6f9 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.46 (Berkeley) %G%";
+static char sccsid[] = "@(#)parseaddr.c        8.47 (Berkeley) %G%";

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


@@ -1715,6 +1715,13 @@ 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 */
        if (*tv != NULL)
        {
        /* do special mapping for local mailer */
        if (*tv != NULL)
        {


@@ -1741,13 +1748,6 @@ badaddr:
                }
        }
 
                }
        }
 

-       if (bitnset(M_CHECKUDB, m->m_flags) && *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);