allow user-setable error codes in "error" mailer

SCCS-mr: usr.sbin/sendmail/src/version.c 141
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 3.73
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.290

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 2afcc59..b23f3ed 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.72            %G%);
+SCCSID(@(#)parseaddr.c 3.73            %G%);

 
 /*
 **  PARSEADDR -- Parse an address
 
 /*
 **  PARSEADDR -- Parse an address


@@ -752,7 +752,12 @@ buildaddr(tv, a)
        tv++;
        if (sameword(*tv, "error"))
        {
        tv++;
        if (sameword(*tv, "error"))
        {

-               if (**++tv != CANONUSER)
+               if (**++tv == CANONHOST)
+               {
+                       setstat(atoi(*++tv));
+                       tv++;
+               }
+               if (**tv != CANONUSER)

                        syserr("buildaddr: error: no user");
                buf[0] = '\0';
                while (*++tv != NULL)
                        syserr("buildaddr: error: no user");
                buf[0] = '\0';
                while (*++tv != NULL)

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 43535f4..5c43650 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.289 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.290 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.289 [%G%]";
+char   Version[] = "3.290 [%G%]";