From owner-p4-projects@FreeBSD.ORG  Fri Apr 28 13:13:49 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 09ECF16A405; Fri, 28 Apr 2006 13:13:49 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B2BF416A400
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 13:13:48 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7B1BF43D45
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 13:13:48 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3SDDmYq007281
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 13:13:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3SDDmYi007275
	for perforce@freebsd.org; Fri, 28 Apr 2006 13:13:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 28 Apr 2006 13:13:48 GMT
Message-Id: <200604281313.k3SDDmYi007275@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 96309 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, 28 Apr 2006 13:13:49 -0000

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

Change 96309 by rwatson@rwatson_zoo on 2006/04/28 13:12:48

	Fix mac_update_mbuf_from_cipso() mismerge.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#244 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#244 (text+ko) ====

@@ -322,7 +322,7 @@
 typedef void	(*mpo_update_ipq_t)(struct mbuf *fragment,
 		    struct label *fragmentlabel, struct ipq *ipq,
 		    struct label *ipqlabel);
-	int	(*mpo_update_mbuf_from_cipso)(struct mbuf *m,
+typedef int	(*mpo_update_mbuf_from_cipso)(struct mbuf *m,
 		    struct label *mlabel, struct ifnet *ifnet,
 		    struct label *ifnetlabel, char *cp, int *code);
 typedef void	(*mpo_inpcb_sosetlabel_t)(struct socket *so,
@@ -746,6 +746,7 @@
 	mpo_reflect_mbuf_tcp_t			mpo_reflect_mbuf_tcp;
 	mpo_relabel_ifnet_t			mpo_relabel_ifnet;
 	mpo_update_ipq_t			mpo_update_ipq;
+	mpo_update_mbuf_from_cipso_t		mpo_update_mbuf_from_cipso;
 	mpo_inpcb_sosetlabel_t			mpo_inpcb_sosetlabel;
 
 	/*