From owner-p4-projects@FreeBSD.ORG  Fri Dec 19 12:07:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3E8801065678; Fri, 19 Dec 2008 12:07:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F38AC106564A
	for <perforce@freebsd.org>; Fri, 19 Dec 2008 12:07:19 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E0D208FC23
	for <perforce@freebsd.org>; Fri, 19 Dec 2008 12:07:19 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJC7J3P094142
	for <perforce@freebsd.org>; Fri, 19 Dec 2008 12:07:19 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJC7Jw5094140
	for perforce@freebsd.org; Fri, 19 Dec 2008 12:07:19 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 19 Dec 2008 12:07:19 GMT
Message-Id: <200812191207.mBJC7Jw5094140@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154993 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Dec 2008 12:07:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=154993

Change 154993 by rwatson@rwatson_cinnamon on 2008/12/19 12:06:47

	#ifdef more errno values not present in some older OS versions,
	such as FreeBSD 4.x.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#11 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. 
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#11 $
  */
 
 #include <sys/types.h>
@@ -275,7 +275,13 @@
 #endif
 	"Package not installed" },
 	{ BSM_EREMOTE, EREMOTE, "Too many levels of remote in path" },
-	{ BSM_ENOLINK, ENOLINK, "Link has been severed" },
+	{ BSM_ENOLINK,
+#ifdef ENOLINK
+	ENOLINK,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	"Link has been severed" },
 	{ BSM_EADV,
 #ifdef EADV
 	EADV,
@@ -297,7 +303,13 @@
 	ERRNO_NO_LOCAL_MAPPING,
 #endif
 	"Communication error on send" },
-	{ BSM_EPROTO, EPROTO, "Protocol error" },
+	{ BSM_EPROTO,
+#ifdef EPROTO
+	EPROTO,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	"Protocol error" },
 	{ BSM_ELOCKUNMAPPED,
 #ifdef ELOCKUNMAPPED
 	ELOCKUNMAPPED,
@@ -312,8 +324,20 @@
 	ERRNO_NO_LOCAL_MAPPING,
 #endif
 	"Facility is not active" },
-	{ BSM_EMULTIHOP, EMULTIHOP, "Multihop attempted" },
-	{ BSM_EBADMSG, EBADMSG, "Bad message" },
+	{ BSM_EMULTIHOP,
+#ifdef EMULTIHOP
+	EMULTIHOP,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	"Multihop attempted" },
+	{ BSM_EBADMSG,
+#ifdef EBADMSG
+	EBADMSG,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	"Bad message" },
 	{ BSM_ENAMETOOLONG, ENAMETOOLONG, "File name too long" },
 	{ BSM_EOVERFLOW, EOVERFLOW, "Value too large to be stored in data type" },
 	{ BSM_ENOTUNIQ,