(no message)

SCCS-vsn: usr.sbin/sendmail/src/err.c 8.29
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 8.37

diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 02ea9bb..b79a637 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)err.c      8.28 (Berkeley) %G%";
+static char sccsid[] = "@(#)err.c      8.29 (Berkeley) %G%";

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

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index ddbb114..8ce3be0 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.36 (Berkeley) %G%";
+static char sccsid[] = "@(#)parseaddr.c        8.37 (Berkeley) %G%";

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


@@ -1654,6 +1654,18 @@ 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
                {