PERFORCE change 96311 for review

[Robert Watson]

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

Change 96311 by rwatson at rwatson_zoo on 2006/04/28 14:30:05

	Fix two more merge nits relating to entry points only in the MAC
	branch and not CVS.

Affected files ...

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

Differences ...

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

@@ -322,7 +322,7 @@
 typedef void	(*mpo_update_ipq_t)(struct mbuf *fragment,
 		    struct label *fragmentlabel, struct ipq *ipq,
 		    struct label *ipqlabel);
-typedef int	(*mpo_update_mbuf_from_cipso)(struct mbuf *m,
+typedef int	(*mpo_update_mbuf_from_cipso_t)(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,
@@ -852,8 +852,8 @@
 	mpo_check_system_swapon_t		mpo_check_system_swapon;
 	mpo_check_system_swapoff_t		mpo_check_system_swapoff;
 	mpo_check_system_sysctl_t		mpo_check_system_sysctl;
-	mpo_thread_syscall_enter_t		mpo_check_syscall_enter;
-	mpo_thread_syscall_exit_t		mpo_check_syscall_exit;
+	mpo_thread_syscall_enter_t		mpo_thread_syscall_enter;
+	mpo_thread_syscall_exit_t		mpo_thread_syscall_exit;
 	mpo_check_vnode_access_t		mpo_check_vnode_access;
 	mpo_check_vnode_chdir_t			mpo_check_vnode_chdir;
 	mpo_check_vnode_chroot_t		mpo_check_vnode_chroot;