move <> and forward path processing to .cf file; increase MAXATOMS

since some "comment" information may now be part of the address.
**** this installation requires a new sendmail.cf file ****

SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 3.47
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.161
SCCS-vsn: usr.sbin/sendmail/src/srvrsmtp.c 3.29

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 4094509..2b7752e 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)parseaddr.c 3.46            %G%);
+SCCSID(@(#)parseaddr.c 3.47            %G%);

 
 /*
 **  PARSE -- Parse an address
 
 /*
 **  PARSE -- Parse an address


@@ -187,7 +187,6 @@ prescan(addr, delim)
        char **avp;
        bool bslashmode;
        int cmntcnt;
        char **avp;
        bool bslashmode;
        int cmntcnt;

-       int brccnt;

        register char c;
        char *tok;
        register char *q;
        register char c;
        char *tok;
        register char *q;


@@ -197,7 +196,7 @@ prescan(addr, delim)
 
        q = buf;
        bslashmode = FALSE;
 
        q = buf;
        bslashmode = FALSE;

-       cmntcnt = brccnt = 0;
+       cmntcnt = 0;

        avp = av;
        state = OPER;
        for (p = addr; *p != '\0' && *p != delim; )
        avp = av;
        state = OPER;
        for (p = addr; *p != '\0' && *p != delim; )


@@ -315,40 +314,6 @@ prescan(addr, delim)
                else if (cmntcnt > 0)
                        continue;
 
                else if (cmntcnt > 0)
                        continue;
 

-               /* we prefer <> specs */
-               if (c == '<')
-               {
-                       if (brccnt < 0)
-                       {
-                               usrerr("multiple < spec");
-                               return (NULL);
-                       }
-                       brccnt++;
-                       if (brccnt == 1)
-                       {
-                               /* we prefer using machine readable name */
-                               q = buf;
-                               *q = '\0';
-                               avp = av;
-                               continue;
-                       }
-               }
-               else if (c == '>')
-               {
-                       if (brccnt <= 0)
-                       {
-                               usrerr("Unbalanced `>'");
-                               return (NULL);
-                       }
-                       else
-                               brccnt--;
-                       if (brccnt <= 0)
-                       {
-                               brccnt = -1;
-                               continue;
-                       }
-               }
-

                if (avp >= &av[MAXATOM])
                {
                        syserr("prescan: too many tokens");
                if (avp >= &av[MAXATOM])
                {
                        syserr("prescan: too many tokens");


@@ -359,8 +324,6 @@ prescan(addr, delim)
        *avp = NULL;
        if (cmntcnt > 0)
                usrerr("Unbalanced '('");
        *avp = NULL;
        if (cmntcnt > 0)
                usrerr("Unbalanced '('");

-       else if (brccnt > 0)
-               usrerr("Unbalanced '<'");

        else if (state == QSTRING)
                usrerr("Unbalanced '\"'");
        else if (av[0] != NULL)
        else if (state == QSTRING)
                usrerr("Unbalanced '\"'");
        else if (av[0] != NULL)

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index 62221d4..9c80e06 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -1,10 +1,10 @@
 # include "sendmail.h"
 
 # ifndef SMTP
 # include "sendmail.h"
 
 # ifndef SMTP

-SCCSID(@(#)srvrsmtp.c  3.28            %G%     (no SMTP));
+SCCSID(@(#)srvrsmtp.c  3.29            %G%     (no SMTP));

 # else SMTP
 
 # else SMTP
 

-SCCSID(@(#)srvrsmtp.c  3.28            %G%);
+SCCSID(@(#)srvrsmtp.c  3.29            %G%);

 
 /*
 **  SMTP -- run the SMTP protocol.
 
 /*
 **  SMTP -- run the SMTP protocol.


@@ -169,12 +169,6 @@ smtp()
                        p = skipword(p, "to");
                        if (p == NULL)
                                break;
                        p = skipword(p, "to");
                        if (p == NULL)
                                break;

-                       if (index(p, ',') != NULL)
-                       {
-                               message("501", "Source routing not implemented");
-                               Errors++;
-                               break;
-                       }

                        a = sendto(p, 1, (ADDRESS *) NULL, 0);
 # ifdef DEBUG
                        if (Debug > 1)
                        a = sendto(p, 1, (ADDRESS *) NULL, 0);
 # ifdef DEBUG
                        if (Debug > 1)

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 9059df8..298dce1 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.160 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.161 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.160 [%G%]";
+char   Version[] = "3.161 [%G%]";