From c8ec8736363c12e10ca8a02710655e0202031396 Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Mon, 7 Mar 1983 17:57:14 -0800
Subject: [PATCH] Don't pass EX_TEMPFAIL code out (since we have already taken
 responsibility for delivering the message anyway).

SCCS-mr: usr.sbin/sendmail/src/version.c 203
SCCS-mr: usr.sbin/sendmail/src/sendmail.h 203
SCCS-mr: usr.sbin/sendmail/src/main.c 203
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.324
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.117
SCCS-vsn: usr.sbin/sendmail/src/main.c 3.157
---
 usr/src/usr.sbin/sendmail/src/main.c     | 4 +++-
 usr/src/usr.sbin/sendmail/src/sendmail.h | 9 ++++++---
 usr/src/usr.sbin/sendmail/src/version.c  | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index ed0c857d38..371d1f264e 100644
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -4,7 +4,7 @@
 # include "sendmail.h"
 # include <sys/file.h>
 
-SCCSID(@(#)main.c	3.156		%G%);
+SCCSID(@(#)main.c	3.157		%G%);
 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.
@@ -638,6 +638,8 @@ finis()
 	if (LogLevel > 11)
 		syslog(LOG_DEBUG, "finis, pid=%d", getpid());
 # endif LOG
+	if (ExitStat == EX_TEMPFAIL)
+		ExitStat = EX_OK;
 	exit(ExitStat);
 }
 /*
diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index aa5623b648..9fdd63a90f 100644
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -7,7 +7,7 @@
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint
-static char SmailSccsId[] =	"@(#)sendmail.h	3.116		%G%";
+static char SmailSccsId[] =	"@(#)sendmail.h	3.117		%G%";
 # endif lint
 # else  _DEFINE
 # define EXTERN extern
@@ -473,10 +473,13 @@ EXTERN u_char	tTdvect[100];
 */
 
 /* set exit status */
-# define setstat(s)		{ if (ExitStat == EX_OK) ExitStat = s; }
+#define setstat(s)	{ \
+				if (ExitStat == EX_OK || ExitStat == EX_TEMPFAIL) \
+					ExitStat = s; \
+			}
 
 /* make a copy of a string */
-# define newstr(s)		strcpy(xalloc(strlen(s) + 1), s)
+#define newstr(s)	strcpy(xalloc(strlen(s) + 1), s)
 
 
 /*
diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 7d6b1243d7..26a2997819 100644
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
-static char	SccsId[] = "@(#)SendMail version 3.323 of %G%";
+static char	SccsId[] = "@(#)SendMail version 3.324 of %G%";
 # endif lint
 
-char	Version[] = "3.323";
+char	Version[] = "3.324";
-- 
2.20.1