PERFORCE change 96309 for review

[Robert Watson]

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

Change 96309 by rwatson at 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;
 
 	/*