From owner-p4-projects@FreeBSD.ORG  Sun Dec 28 15:25:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 879931065675; Sun, 28 Dec 2008 15:25:13 +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 4C1941065676
	for <perforce@freebsd.org>; Sun, 28 Dec 2008 15:25:13 +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 353A88FC16
	for <perforce@freebsd.org>; Sun, 28 Dec 2008 15:25:13 +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 mBSFPDX8075310
	for <perforce@freebsd.org>; Sun, 28 Dec 2008 15:25:13 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 mBSFPDuY075308
	for perforce@freebsd.org; Sun, 28 Dec 2008 15:25:13 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 28 Dec 2008 15:25:13 GMT
Message-Id: <200812281525.mBSFPDuY075308@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 155379 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: Sun, 28 Dec 2008 15:25:13 -0000

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

Change 155379 by rwatson@rwatson_lethe on 2008/12/28 15:25:10

	ifdef PF_ protocol constants not present on Linux.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#2 (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_domain.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#2 $
  */
 
 #include <sys/types.h>
@@ -48,9 +48,27 @@
 	{ BSM_PF_UNSPEC, PF_UNSPEC },
 	{ BSM_PF_LOCAL, PF_LOCAL },
 	{ BSM_PF_INET, PF_INET },
-	{ BSM_PF_IMPLINK, PF_IMPLINK },
-	{ BSM_PF_PUP, PF_PUP },
-	{ BSM_PF_CHAOS, PF_CHAOS },
+	{ BSM_PF_IMPLINK,
+#ifdef PF_IMPLINK
+	PF_IMPLINK
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
+	{ BSM_PF_PUP,
+#ifdef PF_PUP
+	PF_PUP
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
+	{ BSM_PF_CHAOS,
+#ifdef PF_CHAOS
+	PF_CHAOS
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
 	{ BSM_PF_NS,
 #ifdef PF_NS
 	PF_NS
@@ -65,14 +83,50 @@
 	PF_NO_LOCAL_MAPPING
 #endif
 	},
-	{ BSM_PF_ECMA, PF_ECMA },
-	{ BSM_PF_DATAKIT, PF_DATAKIT },
-	{ BSM_PF_CCITT, PF_CCITT },
+	{ BSM_PF_ECMA,
+#ifdef PF_ECMA
+	PF_ECMA
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
+	{ BSM_PF_DATAKIT,
+#ifdef PF_DATAKIT
+	PF_DATAKIT
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
+	{ BSM_PF_CCITT,
+#ifdef PF_CCITT
+	PF_CCITT
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
 	{ BSM_PF_SNA, PF_SNA },
 	{ BSM_PF_DECnet, PF_DECnet },
-	{ BSM_PF_DLI, PF_DLI },
-	{ BSM_PF_LAT, PF_LAT },
-	{ BSM_PF_HYLINK, PF_HYLINK },
+	{ BSM_PF_DLI,
+#ifdef PF_DLI
+	PF_DLI
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
+	{ BSM_PF_LAT,
+#ifdef PF_LAT
+	PF_LAT
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
+	{ BSM_PF_HYLINK,
+#ifdef PF_HYLINK
+	PF_HYLINK
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
 	{ BSM_PF_APPLETALK, PF_APPLETALK },
 	{ BSM_PF_NIT,
 #ifdef PF_NIT
@@ -88,7 +142,13 @@
 	PF_NO_LOCAL_MAPPING
 #endif
 	},
-	{ BSM_PF_OSI, PF_OSI },
+	{ BSM_PF_OSI,
+#ifdef PF_OSI
+	PF_OSI
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
 	{ BSM_PF_X25,
 #ifdef PF_X25
 	PF_X25
@@ -112,7 +172,13 @@
 	},
 	{ BSM_PF_IPX, PF_IPX },
 	{ BSM_PF_ROUTE, PF_ROUTE },
-	{ BSM_PF_LINK, PF_LINK },
+	{ BSM_PF_LINK,
+#ifdef PF_LINK
+	PF_LINK
+#else
+	PF_NO_LOCAL_MAPPING
+#endif
+	},
 	{ BSM_PF_INET6, PF_INET6 },
 	{ BSM_PF_KEY, PF_KEY },
 	{ BSM_PF_NCA,