From 21ec078e59339d60cc615c10f365e27df3db4f08 Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Wed, 22 Oct 1980 06:39:47 -0800
Subject: [PATCH] EX_UNAVAIL => EX_UNAVAILABLE

SCCS-vsn: usr.sbin/sendmail/src/conf.c 1.10
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 1.8
SCCS-vsn: usr.sbin/sendmail/src/err.c 1.5
SCCS-vsn: usr.sbin/sendmail/src/util.c 1.4
---
 usr/src/usr.sbin/sendmail/src/conf.c    | 6 +++---
 usr/src/usr.sbin/sendmail/src/deliver.c | 6 +++---
 usr/src/usr.sbin/sendmail/src/err.c     | 4 ++--
 usr/src/usr.sbin/sendmail/src/util.c    | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 1df41017c9..ba210a5b9e 100644
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -103,7 +103,7 @@
 
 
 
-static char SccsId[] = "@(#)conf.c	1.9	%G%";
+static char SccsId[] = "@(#)conf.c	1.10	%G%";
 
 
 bool	UseMsgId = FALSE;	/* don't put message id's in anywhere */
@@ -191,13 +191,13 @@ struct mailer Mailer[] =
 	/* pipes through programs -- must be #1 */
 	{
 		"/bin/csh",
-		M_HDR|M_NOHOST,			EX_UNAVAIL,	NULL,
+		M_HDR|M_NOHOST,			EX_UNAVAILABLE,	NULL,
 		{ "...prog%mail", "-fc", "$u", NULL }
 	},
 	/* local berkeley mail */
 	{
 		"/usr/net/bin/sendberkmail",
-		M_FOPT|M_HDR|M_STRIPQ,		EX_UNAVAIL,	BerkLocal,
+		M_FOPT|M_HDR|M_STRIPQ,		EX_UNAVAILABLE,	BerkLocal,
 		{ "...berk%mail", "-m", "$h", "-t", "$u", "-h", "$c", NULL }
 	},
 	/* arpanet mail */
diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index eecaf81cca..9279fa03d1 100644
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -6,7 +6,7 @@
 # include <log.h>
 # endif LOG
 
-static char SccsId[] = "@(#)deliver.c	1.7	%G%";
+static char SccsId[] = "@(#)deliver.c	1.8	%G%";
 
 /*
 **  DELIVER -- Deliver a message to a particular address.
@@ -234,7 +234,7 @@ deliver(to, editfcn)
 		execv(m->m_mailer, pvp);
 		/* syserr fails because log is closed */
 		/* syserr("Cannot exec %s", m->m_mailer); */
-		exit(EX_UNAVAIL);
+		exit(EX_UNAVAILABLE);
 	}
 
 	/* arrange to write out header message if error */
@@ -265,7 +265,7 @@ deliver(to, editfcn)
 	if ((st & 0377) != 0)
 	{
 		syserr("%s: stat %o", pvp[0], st);
-		ExitStat = EX_UNAVAIL;
+		ExitStat = EX_UNAVAILABLE;
 		return (-1);
 	}
 	i = (st >> 8) & 0377;
diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 80905b8658..1de4e162df 100644
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -4,7 +4,7 @@
 # include <log.h>
 # endif LOG
 
-static char	SccsId[] = "@(#)err.c	1.4	%G%";
+static char	SccsId[] = "@(#)err.c	1.5	%G%";
 
 /*
 **  SYSERR -- Print error message.
@@ -52,7 +52,7 @@ syserr(fmt, a, b, c, d, e)
 		if (errno == 0)
 			ExitStat = EX_SOFTWARE;
 		else
-			ExitStat = EX_UNAVAIL;
+			ExitStat = EX_OSERR;
 	}
 
 # ifdef LOG
diff --git a/usr/src/usr.sbin/sendmail/src/util.c b/usr/src/usr.sbin/sendmail/src/util.c
index 97ff8f20d1..74c2e3f775 100644
--- a/usr/src/usr.sbin/sendmail/src/util.c
+++ b/usr/src/usr.sbin/sendmail/src/util.c
@@ -1,7 +1,7 @@
 # include <sysexits.h>
 # include "useful.h"
 
-static char	SccsId[] = "@(#)util.c	1.3	%G%";
+static char	SccsId[] = "@(#)util.c	1.4	%G%";
 
 /*
 **  STRIPQUOTES -- Strip quotes & quote bits from a string.
@@ -66,7 +66,7 @@ xalloc(sz)
 	if (p == NULL)
 	{
 		syserr("Out of memory!!");
-		exit(EX_UNAVAIL);
+		exit(EX_UNAVAILABLE);
 	}
 	return (p);
 }
-- 
2.20.1