From 314d2f5242a313198d449ed8ad0db799e69f4d42 Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Sun, 29 Aug 1982 22:52:20 -0800
Subject: [PATCH] give 554 message on syserr (instead of 451) if errno == 0; as
 it was some permanent errors appeared transient

SCCS-vsn: usr.sbin/sendmail/src/conf.c 3.55
SCCS-vsn: usr.sbin/sendmail/src/err.c 3.29
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.178
---
 usr/src/usr.sbin/sendmail/src/conf.c    |  9 +++++----
 usr/src/usr.sbin/sendmail/src/err.c     | 12 +++++++++---
 usr/src/usr.sbin/sendmail/src/version.c |  4 ++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 93d88d5c46..c63b40d572 100644
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -36,7 +36,7 @@
 
 
 
-SCCSID(@(#)conf.c	3.54		%G%);
+SCCSID(@(#)conf.c	3.55		%G%);
 /*
 **  Header info table
 **	Final (null) entry contains the flags used for any other field.
@@ -75,9 +75,10 @@ struct hdrinfo	HdrInfo[] =
 **  ARPANET error message numbers.
 */
 
-char	Arpa_Info[] =	"050";	/* arbitrary info */
-char	Arpa_Syserr[] =	"451";	/* some (transient) system error */
-char	Arpa_Usrerr[] =	"554";	/* some (fatal) user error */
+char	Arpa_Info[] =		"050";	/* arbitrary info */
+char	Arpa_TSyserr[] =	"451";	/* some (transient) system error */
+char	Arpa_PSyserr[] =	"554";	/* some (permanent) system error */
+char	Arpa_Usrerr[] =		"554";	/* some (fatal) user error */
 
 
 
diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 20ff4ee432..1c21814138 100644
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
-SCCSID(@(#)err.c	3.28		%G%);
+SCCSID(@(#)err.c	3.29		%G%);
 
 /*
 **  SYSERR -- Print error message.
@@ -31,10 +31,16 @@ static char	MsgBuf[BUFSIZ*2];	/* text of most recent message */
 syserr(fmt, a, b, c, d, e)
 	char *fmt;
 {
-	extern char Arpa_Syserr[];
+	extern char Arpa_PSyserr[];
+	extern char Arpa_TSyserr[];
+	register char *p;
 
 	/* format and output the error message */
-	fmtmsg(MsgBuf, (char *) NULL, Arpa_Syserr, fmt, a, b, c, d, e);
+	if (errno == 0)
+		p = Arpa_PSyserr;
+	else
+		p = Arpa_TSyserr;
+	fmtmsg(MsgBuf, (char *) NULL, p, fmt, a, b, c, d, e);
 	putmsg(MsgBuf);
 
 	/* mark the error as having occured */
diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index a94b75e867..116c53fa23 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.177 of %G%";
+static char	SccsId[] = "@(#)SendMail version 3.178 of %G%";
 # endif lint
 
-char	Version[] = "3.177 [%G%]";
+char	Version[] = "3.178 [%G%]";
-- 
2.20.1