force -oee to really always return zero

SCCS-vsn: usr.sbin/sendmail/src/main.c 8.120
SCCS-vsn: usr.sbin/sendmail/src/savemail.c 8.72

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 6b57ca1..888ca48 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,7 +13,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     8.119 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.120 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 #endif /* not lint */
 
 #define        _DEFINE


@@ -1190,7 +1190,7 @@ finis()
        if (LogLevel > 78)
                syslog(LOG_DEBUG, "finis, pid=%d", getpid());
 # endif /* LOG */
        if (LogLevel > 78)
                syslog(LOG_DEBUG, "finis, pid=%d", getpid());
 # endif /* LOG */

-       if (ExitStat == EX_TEMPFAIL)
+       if (ExitStat == EX_TEMPFAIL || CurEnv->e_errormode == EM_BERKNET)

                ExitStat = EX_OK;
 
        /* reset uid for process accounting */
                ExitStat = EX_OK;
 
        /* reset uid for process accounting */

diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index b4e27c9..cb0f7a9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)savemail.c 8.71 (Berkeley) %G%";
+static char sccsid[] = "@(#)savemail.c 8.72 (Berkeley) %G%";

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


@@ -119,11 +119,6 @@ savemail(e, sendbody)
                break;
 
          case EM_BERKNET:
                break;
 
          case EM_BERKNET:

-               /* mail back, but return o.k. exit status */
-               ExitStat = EX_OK;
-
-               /* fall through.... */
-

          case EM_MAIL:
                state = ESM_MAIL;
                break;
          case EM_MAIL:
                state = ESM_MAIL;
                break;